[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2681/8267] meta-environment: ensure corret TOOLCHAIN_CONFIGSITE_NOCACHE value

[Emmanuele Bassi <ebassi src gnome org>]

commit 725e66e1d08ae000d8f68455ddca0e192080dc1f
Author: Chen Qi <Qi Chen windriver com>
Date:   Mon Sep 26 11:20:28 2016 +0800

    meta-environment: ensure corret TOOLCHAIN_CONFIGSITE_NOCACHE value
    
    Expand TOOLCHAIN_CONFIGSITE_NOCACHE value immediately before inheriting
    cross-canadian to avoid HOST_ARCH being changed from TARGET_ARCH to SDK_ARCH,
    thus ensuring its correct value.
    
    [YOCTO #10255]
    
    (From OE-Core rev: 1e13d1fd22186af5544e7248dc12635cd2f2e08b)
    
    Signed-off-by: Chen Qi <Qi Chen windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-core/meta/meta-environment.bb |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb
index 49d45f6..d9e045f 100644
--- a/meta/recipes-core/meta/meta-environment.bb
+++ b/meta/recipes-core/meta/meta-environment.bb
@@ -12,6 +12,8 @@ REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}"
 
 inherit toolchain-scripts
 TOOLCHAIN_NEED_CONFIGSITE_CACHE_append = " zlib"
+# Need to expand here before cross-candian changes HOST_ARCH -> SDK_ARCH
+TOOLCHAIN_CONFIGSITE_NOCACHE := "${TOOLCHAIN_CONFIGSITE_NOCACHE}"
 
 SDK_DIR = "${WORKDIR}/sdk"
 SDK_OUTPUT = "${SDK_DIR}/image"