summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-01 18:00:36 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-03 17:41:16 +0100
commit6ebd0a8c9a7e514e3ee46ae2c61b3a9ec962101f (patch)
tree8efa1c108ff900f057124a43d364aee798e45875 /meta/classes
parent64e2badde0fa0c3d30a4b4f4ad950eefcb8bfc16 (diff)
downloadpoky-6ebd0a8c9a7e514e3ee46ae2c61b3a9ec962101f.tar.gz
toolchain-scripts: Add handling for CANADIANEXTRAOS
When we build a general toolchain script we should add all the OS variants to PATH, not just the current one. This is because some can cross reference each other and if the triplet prefixed ld can't be found for example, you recieve strange errors. Doing this resolves bugs exposed during SDK testing. [YOCTO #6490] (From OE-Core rev: 5f8bbb15c2b79a94ad547347306b59bd67dba3e8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/toolchain-scripts.bbclass6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index b9f2aea930..413effecfa 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -14,7 +14,11 @@ toolchain_create_sdk_env_script () {
14 rm -f $script 14 rm -f $script
15 touch $script 15 touch $script
16 echo 'export SDKTARGETSYSROOT='"$sysroot" >> $script 16 echo 'export SDKTARGETSYSROOT='"$sysroot" >> $script
17 echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/${TARGET_SYS}:$PATH' >> $script 17 EXTRAPATH=""
18 for i in ${CANADIANEXTRAOS}; do
19 EXTRAPATH="$EXTRAPATH:"`echo ${SDKPATHNATIVE}${bindir_nativesdk}/${TARGET_SYS} | sed -e 's,${TARGET_PREFIX},${TARGET_PREFIX}$i,g'`
20 done
21 echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/${TARGET_SYS}'$EXTRAPATH':$PATH' >> $script
18 echo 'export PKG_CONFIG_SYSROOT_DIR=$SDKTARGETSYSROOT' >> $script 22 echo 'export PKG_CONFIG_SYSROOT_DIR=$SDKTARGETSYSROOT' >> $script
19 echo 'export PKG_CONFIG_PATH=$SDKTARGETSYSROOT'"$libdir"'/pkgconfig' >> $script 23 echo 'export PKG_CONFIG_PATH=$SDKTARGETSYSROOT'"$libdir"'/pkgconfig' >> $script
20 echo 'export CONFIG_SITE=${SDKPATH}/site-config-'"${multimach_target_sys}" >> $script 24 echo 'export CONFIG_SITE=${SDKPATH}/site-config-'"${multimach_target_sys}" >> $script