diff options
| author | Ross Burton <ross.burton@intel.com> | 2016-09-22 13:24:30 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-23 14:56:39 +0100 |
| commit | 65a7b15b44d4273a560d95ecbfd65cd4265024b3 (patch) | |
| tree | 411181c902a10ae1a5cbeceb3f88238e55d840f9 | |
| parent | e08640b409d7e9a10c9e7e37cc712145e7050dd9 (diff) | |
| download | poky-65a7b15b44d4273a560d95ecbfd65cd4265024b3.tar.gz | |
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.
(From OE-Core rev: 6bd507ef36578ba7bee6ef8b3f8f6465afca4e20)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/conf/bitbake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index b6a1a68f53..359f787b29 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
| @@ -129,7 +129,7 @@ TARGET_CC_ARCH = "${TUNE_CCARGS}" | |||
| 129 | TARGET_LD_ARCH = "${TUNE_LDARGS}" | 129 | TARGET_LD_ARCH = "${TUNE_LDARGS}" |
| 130 | TARGET_AS_ARCH = "${TUNE_ASARGS}" | 130 | TARGET_AS_ARCH = "${TUNE_ASARGS}" |
| 131 | 131 | ||
| 132 | SDK_ARCH = "${BUILD_ARCH}" | 132 | SDKMACHINE ??= "x86_64" |
| 133 | SDK_OS = "${BUILD_OS}" | 133 | SDK_OS = "${BUILD_OS}" |
| 134 | SDK_VENDOR = "-oesdk" | 134 | SDK_VENDOR = "-oesdk" |
| 135 | SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + d.getVar('SDK_OS', True), ''][d.getVar('SDK_OS', True) == ('' or 'custom')]}" | 135 | SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + d.getVar('SDK_OS', True), ''][d.getVar('SDK_OS', True) == ('' or 'custom')]}" |