summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Witt <randy.e.witt@linux.intel.com>2015-02-23 17:00:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-24 17:41:43 +0000
commitfe678e75ea7048bdbcc60022aaf2bc4b332c7538 (patch)
tree30aaa91666945d08f2cf338d1745c499717f8ede
parent1118c12bdf56fd1cf84c1ba857bf27f81d7c3549 (diff)
downloadpoky-fe678e75ea7048bdbcc60022aaf2bc4b332c7538.tar.gz
toolchain-scripts: Add parameters to toolchain_create_sdk_env_script.
To add some flexibility to setting up the paths for the toolchain, add some parameters. This initial use will be in order to point at the buildsystem toolchain copied in by copy_buildsystem.py. (From OE-Core rev: 62930ea37cfd5ba787ee85bc8dab23c20a775253) Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/toolchain-scripts.bbclass15
1 files changed, 9 insertions, 6 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 9836db4a4c..ea6aff0780 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -7,6 +7,9 @@ REAL_MULTIMACH_TARGET_SYS ?= "${MULTIMACH_TARGET_SYS}"
7# This function creates an environment-setup-script for use in a deployable SDK 7# This function creates an environment-setup-script for use in a deployable SDK
8toolchain_create_sdk_env_script () { 8toolchain_create_sdk_env_script () {
9 # Create environment setup script 9 # Create environment setup script
10 sdkpathnative=${7:-${SDKPATHNATIVE}}
11 prefix=${6:-${prefix_nativesdk}}
12 bindir=${5:-${bindir_nativesdk}}
10 libdir=${4:-${libdir}} 13 libdir=${4:-${libdir}}
11 sysroot=${3:-${SDKTARGETSYSROOT}} 14 sysroot=${3:-${SDKTARGETSYSROOT}}
12 multimach_target_sys=${2:-${REAL_MULTIMACH_TARGET_SYS}} 15 multimach_target_sys=${2:-${REAL_MULTIMACH_TARGET_SYS}}
@@ -16,17 +19,17 @@ toolchain_create_sdk_env_script () {
16 echo 'export SDKTARGETSYSROOT='"$sysroot" >> $script 19 echo 'export SDKTARGETSYSROOT='"$sysroot" >> $script
17 EXTRAPATH="" 20 EXTRAPATH=""
18 for i in ${CANADIANEXTRAOS}; do 21 for i in ${CANADIANEXTRAOS}; do
19 EXTRAPATH="$EXTRAPATH:${SDKPATHNATIVE}${bindir_nativesdk}/${TARGET_ARCH}${TARGET_VENDOR}-$i" 22 EXTRAPATH="$EXTRAPATH:$sdkpathnative$bindir/${TARGET_ARCH}${TARGET_VENDOR}-$i"
20 done 23 done
21 echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/${TARGET_SYS}'$EXTRAPATH':$PATH' >> $script 24 echo "export PATH=$sdkpathnative$bindir:$sdkpathnative$bindir/${TARGET_SYS}"$EXTRAPATH':$PATH' >> $script
22 echo 'export CCACHE_PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/${TARGET_SYS}'$EXTRAPATH':$CCACHE_PATH' >> $script 25 echo 'export CCACHE_PATH=$sdkpathnative$bindir:$sdkpathnative$bindir/${TARGET_SYS}'$EXTRAPATH':$CCACHE_PATH' >> $script
23 echo 'export PKG_CONFIG_SYSROOT_DIR=$SDKTARGETSYSROOT' >> $script 26 echo 'export PKG_CONFIG_SYSROOT_DIR=$SDKTARGETSYSROOT' >> $script
24 echo 'export PKG_CONFIG_PATH=$SDKTARGETSYSROOT'"$libdir"'/pkgconfig' >> $script 27 echo 'export PKG_CONFIG_PATH=$SDKTARGETSYSROOT'"$libdir"'/pkgconfig' >> $script
25 echo 'export CONFIG_SITE=${SDKPATH}/site-config-'"${multimach_target_sys}" >> $script 28 echo 'export CONFIG_SITE=${SDKPATH}/site-config-'"${multimach_target_sys}" >> $script
26 echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script 29 echo "export OECORE_NATIVE_SYSROOT=\"$sdkpathnative\"" >> $script
27 echo 'export OECORE_TARGET_SYSROOT="$SDKTARGETSYSROOT"' >> $script 30 echo 'export OECORE_TARGET_SYSROOT="$SDKTARGETSYSROOT"' >> $script
28 echo 'export OECORE_ACLOCAL_OPTS="-I ${SDKPATHNATIVE}/usr/share/aclocal"' >> $script 31 echo "export OECORE_ACLOCAL_OPTS=\"-I $sdkpathnative/usr/share/aclocal\"" >> $script
29 echo 'export PYTHONHOME=${SDKPATHNATIVE}${prefix_nativesdk}' >> $script 32 echo "export PYTHONHOME=$sdkpathnative$prefix" >> $script
30 33
31 toolchain_shared_env_script 34 toolchain_shared_env_script
32} 35}