]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
toolchain-script: use immediate expansion for TOOLCHAIN_CONFIGSITE_NOCACHE ChenQi/toolchain-site-config
authorChen Qi <Qi.Chen@windriver.com>
Fri, 30 Oct 2015 07:27:27 +0000 (15:27 +0800)
committerChen Qi <Qi.Chen@windriver.com>
Tue, 15 Mar 2016 06:51:53 +0000 (14:51 +0800)
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>
meta/classes/toolchain-scripts.bbclass

index 2e2c93af41d0114be19e0f5038e8505ed695fa73..d8ea4f18a3af7b1327baa16421528f70c2051e29 100644 (file)
@@ -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"