summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2016-09-23 14:17:57 +0800
committerChen Qi <Qi.Chen@windriver.com>2016-09-23 14:19:21 +0800
commitb837a1b7714ef69601f5a12cbf5baf925dfb1a7b (patch)
tree913ba51b224b1e19b7803f91a03d26fd3fd67d34
parent7e0f95bf359bc3b5bb1578024a993e184de155cd (diff)
downloadopenembedded-core-contrib-ChenQi/siteconfig.tar.gz
openembedded-core-contrib-ChenQi/siteconfig.tar.bz2
openembedded-core-contrib-ChenQi/siteconfig.zip
toolchain-script: use immediate expansion for TOOLCHAIN_CONFIGSITE_NOCACHEChenQi/siteconfig
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. [YOCTO #10255] Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-rw-r--r--meta/classes/toolchain-scripts.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 997ff8865f..8df09672b0 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -105,7 +105,7 @@ EOF
}
#we get the cached site config in the runtime
-TOOLCHAIN_CONFIGSITE_NOCACHE = "${@siteinfo_get_files(d)}"
+TOOLCHAIN_CONFIGSITE_NOCACHE := "${@siteinfo_get_files(d)}"
TOOLCHAIN_CONFIGSITE_SYSROOTCACHE = "${STAGING_DIR}/${MLPREFIX}${MACHINE}/${target_datadir}/${TARGET_SYS}_config_site.d"
TOOLCHAIN_NEED_CONFIGSITE_CACHE ??= "virtual/${MLPREFIX}libc ncurses"