diff options
| author | Lianhao Lu <lianhao.lu@intel.com> | 2011-07-28 19:10:16 +0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2011-08-01 00:04:09 -0700 |
| commit | b69a2be2f30dc633597399d42d6c87d9f0910c1a (patch) | |
| tree | a7f2738f124066a20b3a6e45b724c4786b67bf11 /meta/classes | |
| parent | e23f9ce928353c9da2b9c4bfa9a1a125a7d160f2 (diff) | |
| download | openembedded-core-b69a2be2f30dc633597399d42d6c87d9f0910c1a.tar.gz openembedded-core-b69a2be2f30dc633597399d42d6c87d9f0910c1a.tar.bz2 openembedded-core-b69a2be2f30dc633597399d42d6c87d9f0910c1a.tar.xz openembedded-core-b69a2be2f30dc633597399d42d6c87d9f0910c1a.zip | |
meta-environment: set correct *MULTIMACH_TARGET_SYS.
Fixed [BUGID #1299]. OLD_MULTIMACH_TARGET_SYS is no longer available.
Use new recipe-scope variable REAL_MULTIMACH_TARGET_SYS instead.
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/toolchain-scripts.bbclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index 330131920..832cce41a 100644 --- a/meta/classes/toolchain-scripts.bbclass +++ b/meta/classes/toolchain-scripts.bbclass @@ -66,13 +66,14 @@ toolchain_create_tree_env_script () { # This function creates an environment-setup-script for use by the ADT installer toolchain_create_sdk_env_script_for_installer () { # Create environment setup script - script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${OLD_MULTIMACH_TARGET_SYS} + local multimach_target_sys=$1 + script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${multimach_target_sys} rm -f $script touch $script - echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/${OLD_MULTIMACH_TARGET_SYS}:$PATH' >> $script + echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/'"${multimach_target_sys}"':$PATH' >> $script echo 'export PKG_CONFIG_SYSROOT_DIR=##SDKTARGETSYSROOT##' >> $script echo 'export PKG_CONFIG_PATH=##SDKTARGETSYSROOT##${target_libdir}/pkgconfig' >> $script - echo 'export CONFIG_SITE=${SDKPATH}/site-config-${OLD_MULTIMACH_TARGET_SYS}' >> $script + echo 'export CONFIG_SITE=${SDKPATH}/site-config-'"${multimach_target_sys}" >> $script echo 'export CC=${TARGET_PREFIX}gcc' >> $script echo 'export CXX=${TARGET_PREFIX}g++' >> $script echo 'export GDB=${TARGET_PREFIX}gdb' >> $script |