diff options
Diffstat (limited to 'meta/classes/toolchain-scripts.bbclass')
-rw-r--r-- | meta/classes/toolchain-scripts.bbclass | 15 |
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 |
8 | toolchain_create_sdk_env_script () { | 8 | toolchain_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 | } |