[oe-commits] [openembedded-core] 04/13: bitbake.conf: add a lazy default for SDKMACHINE

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 6bd507ef36578ba7bee6ef8b3f8f6465afca4e20
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Thu Sep 22 13:24:30 2016 +0100

    bitbake.conf: add a lazy default for SDKMACHINE
    
    If the user doesn't set SDKMACHINE in their local.conf then uninative and
    buildtools will fail in obscure ways, so ensure that a default value is set.
    
    Also as SDK_ARCH will be overritten then loading the machine-sdk configuration
    file, don't bother assigning it.
    
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index b6a1a68..359f787 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -129,7 +129,7 @@ TARGET_CC_ARCH = "${TUNE_CCARGS}"
 TARGET_LD_ARCH = "${TUNE_LDARGS}"
 TARGET_AS_ARCH = "${TUNE_ASARGS}"
 
-SDK_ARCH = "${BUILD_ARCH}"
+SDKMACHINE ??= "x86_64"
 SDK_OS = "${BUILD_OS}"
 SDK_VENDOR = "-oesdk"
 SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + d.getVar('SDK_OS', True), ''][d.getVar('SDK_OS', True) == ('' or 'custom')]}"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.