toolchain-script: Really fix CANADIANEXTRAOE issues

There was an error in the previous fix for the powerpc toolchain issue, this
should correct it (and simplify the code too).

[YOCTO #6490]

(From OE-Core rev: 54ddf3fe060715534cd9e23d6e89cf6b06ed3d9f)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 413effe..6cc8eba 100644 (file)
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -16,7 +16,7 @@ toolchain_create_sdk_env_script () {
        echo 'export SDKTARGETSYSROOT='"$sysroot" >> $script
        EXTRAPATH=""
        for i in ${CANADIANEXTRAOS}; do
-               EXTRAPATH="$EXTRAPATH:"`echo ${SDKPATHNATIVE}${bindir_nativesdk}/${TARGET_SYS} | sed -e 's,${TARGET_PREFIX},${TARGET_PREFIX}$i,g'`
+               EXTRAPATH="$EXTRAPATH:${SDKPATHNATIVE}${bindir_nativesdk}/${TARGET_ARCH}${TARGET_VENDOR}-$i"
        done
        echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/${TARGET_SYS}'$EXTRAPATH':$PATH' >> $script
        echo 'export PKG_CONFIG_SYSROOT_DIR=$SDKTARGETSYSROOT' >> $script