[oe-commits] [openembedded-core] 35/69: toolchain-script: use immediate expansion for TOOLCHAIN_CONFIGSITE_NOCACHE

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 22d4ee68d108dfcbee0ed770453d61abd514c52f
Author: Chen Qi <Qi.Chen at windriver.com>
AuthorDate: Fri Oct 30 15:50:19 2015 +0800

    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 at windriver.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 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 2e2c93a..d8ea4f1 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"
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.