From b837a1b7714ef69601f5a12cbf5baf925dfb1a7b Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Fri, 23 Sep 2016 14:17:57 +0800 Subject: 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. [YOCTO #10255] Signed-off-by: Chen Qi --- meta/classes/toolchain-scripts.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" -- cgit 1.2.3-korg