From 78b2f5a72e0f33e551307a1d4c1f99e81aea4cac Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 29 Sep 2014 17:44:53 +0100 Subject: 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 --- meta/recipes-core/meta/meta-environment.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb index c6d3bb8..bd90f9f 100644 --- a/meta/recipes-core/meta/meta-environment.bb +++ b/meta/recipes-core/meta/meta-environment.bb @@ -6,14 +6,14 @@ PR = "r8" EXCLUDE_FROM_WORLD = "1" -REAL_MULTIMACH_TARGET_SYS := "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" +REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" inherit toolchain-scripts TOOLCHAIN_NEED_CONFIGSITE_CACHE += "zlib" SDK_DIR = "${WORKDIR}/sdk" SDK_OUTPUT = "${SDK_DIR}/image" -SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${TARGET_SYS}" +SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}" inherit cross-canadian -- cgit v1.1