[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4321/8267] toolchain-scripts: remove CCACHE_PATH from environment script

[Emmanuele Bassi <ebassi src gnome org>]

commit 0eafcc05d83da3a0add0d116fe239b528c144f15
Author: Joshua Lock <joshua g lock intel com>
Date:   Tue Jan 24 11:41:39 2017 +0000

    toolchain-scripts: remove CCACHE_PATH from environment script
    
    CCACHE_PATH was added to the toolchain-scripts in commit
    1d31ddb856a80ba9da1a64ed5d701dc0f7351ef7 without a detailed
    explanation as to why. This commit removes that environment
    variable as it's causing failures since the introduction of
    host_gcc_version() to oe.utils in
    d36f41e5658bbbb6080ee833027879c119edf3e0, as used by
    uninative to determine NATIVELSBSTRING.
    
    This causes errors when the host has ccache available in in PATH
    - host_gcc_version() fails because ccache has been told to only
    look for the compiler in CCACHE_PATH and can't find gcc in order
    to check its version. Toolchain compilers aren't detected due to
    the binaries being prefixed with the triplet of the target.
    
    (From OE-Core rev: e47fb403c2cb472d2666ed3ba4b10933467c8c7b)
    
    Signed-off-by: Joshua Lock <joshua g lock intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/toolchain-scripts.bbclass |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
---
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 7b68d20..260ece9 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -31,7 +31,6 @@ toolchain_create_sdk_env_script () {
                EXTRAPATH="$EXTRAPATH:$sdkpathnative$bindir/${TARGET_ARCH}${TARGET_VENDOR}-$i"
        done
        echo "export 
PATH=$sdkpathnative$bindir:$sdkpathnative$sbindir:$sdkpathnative$base_bindir:$sdkpathnative$base_sbindir:$sdkpathnative$bindir/../${HOST_SYS}/bin:$sdkpathnative$bindir/${TARGET_SYS}"$EXTRAPATH':$PATH'
> > $script
-       echo "export 
CCACHE_PATH=$sdkpathnative$bindir:$sdkpathnative$bindir/../${HOST_SYS}/bin:$sdkpathnative$bindir/${TARGET_SYS}"$EXTRAPATH':$CCACHE_PATH'
> > $script
        echo 'export PKG_CONFIG_SYSROOT_DIR=$SDKTARGETSYSROOT' >> $script
        echo 'export 
PKG_CONFIG_PATH=$SDKTARGETSYSROOT'"$libdir"'/pkgconfig:$SDKTARGETSYSROOT'"$prefix"'/share/pkgconfig' >> 
$script
        echo 'export CONFIG_SITE=${SDKPATH}/site-config-'"${multimach_target_sys}" >> $script
@@ -50,7 +49,6 @@ toolchain_create_tree_env_script () {
        rm -f $script
        touch $script
        echo 'export PATH=${STAGING_DIR_NATIVE}/usr/bin:${PATH}' >> $script
-       echo 'export CCACHE_PATH=${STAGING_DIR_NATIVE}/usr/bin:${CCACHE_PATH}' >> $script
        echo 'export PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR}' >> $script
        echo 'export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}' >> $script
        echo 'export CONFIG_SITE="${@siteinfo_get_files(d)}"' >> $script