meta-environment: Two critical fixes to unbreak toolchains
PATCH 1/1 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.
Signed-off-by Richard Purdie <[email protected]>
meta/recipes-core/meta/meta-environment.bb +2 -2
@@ -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