From: Chen Qi <Qi.Chen@windriver.com>
Date: Fri, 30 Oct 2015 07:27:27 +0000 (+0800)
Subject: toolchain-script: use immediate expansion for TOOLCHAIN_CONFIGSITE_NOCACHE
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2FChenQi%2Ftoolchain-site-config;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

toolchain-script: use immediate expansion for TOOLCHAIN_CONFIGSITE_NOCACHE

Use immediate expansion for the assignment to avoid other classes modifying
variables like HOST_ARCH which changes the result. This happens in the
meta-environment recipe. It inherits cross-canadian which changes HOST_ARCH
from TARGET_ARCH to SDK_ARCH, resulting in wrong site config files in the
generated SDK.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---

diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 2e2c93af41d..d8ea4f18a3a 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -101,7 +101,7 @@ EOF
 }
 
 #we get the cached site config in the runtime
-TOOLCHAIN_CONFIGSITE_NOCACHE = "${@siteinfo_get_files(d, True)}"
+TOOLCHAIN_CONFIGSITE_NOCACHE := "${@siteinfo_get_files(d, True)}"
 TOOLCHAIN_CONFIGSITE_SYSROOTCACHE = "${STAGING_DIR}/${MLPREFIX}${MACHINE}/${target_datadir}/${TARGET_SYS}_config_site.d"
 TOOLCHAIN_NEED_CONFIGSITE_CACHE ??= "virtual/${MLPREFIX}libc ncurses"