summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-29 17:44:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-30 14:10:33 +0100
commit78b2f5a72e0f33e551307a1d4c1f99e81aea4cac (patch)
tree8be50533c375ebe004e052316d47de9a492d8015 /meta
parentb2637adf847d02c5c3e568937bd88459d45ae7f9 (diff)
downloadpoky-78b2f5a72e0f33e551307a1d4c1f99e81aea4cac.tar.gz
meta-environment: Two critical fixes to unbreak toolchains
Firstly, when multilib builds were being used, the same output files were used in each case, being overwritten each time due to the fact that REAL_MULTIMACH_TARGET_SYS has been expanded. Instead of immediate expansion, just use assignment. This overrides the problematic define in toolchain-scripts.bbclass but allows the multilib code to work. Secondly, the target sysroot was being defined incorrectly which this patch fixes. This was breaking the toolchains. (From OE-Core rev: 17229152453a8633b2cd63b429f98cc7c192f300) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/meta/meta-environment.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb
index c6d3bb8d1c..bd90f9fd7c 100644
--- a/meta/recipes-core/meta/meta-environment.bb
+++ b/meta/recipes-core/meta/meta-environment.bb
@@ -6,14 +6,14 @@ PR = "r8"
6 6
7EXCLUDE_FROM_WORLD = "1" 7EXCLUDE_FROM_WORLD = "1"
8 8
9REAL_MULTIMACH_TARGET_SYS := "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" 9REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}"
10 10
11inherit toolchain-scripts 11inherit toolchain-scripts
12TOOLCHAIN_NEED_CONFIGSITE_CACHE += "zlib" 12TOOLCHAIN_NEED_CONFIGSITE_CACHE += "zlib"
13 13
14SDK_DIR = "${WORKDIR}/sdk" 14SDK_DIR = "${WORKDIR}/sdk"
15SDK_OUTPUT = "${SDK_DIR}/image" 15SDK_OUTPUT = "${SDK_DIR}/image"
16SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${TARGET_SYS}" 16SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}"
17 17
18inherit cross-canadian 18inherit cross-canadian
19 19