From e464fb9a2809aa88f56b5c44d318d3bb3dadd7fc Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Thu, 28 Jul 2011 19:10:16 +0800 Subject: 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. (From OE-Core rev: b69a2be2f30dc633597399d42d6c87d9f0910c1a) Signed-off-by: Lianhao Lu Signed-off-by: Richard Purdie --- meta/classes/toolchain-scripts.bbclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'meta/classes/toolchain-scripts.bbclass') diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index 3301319207..832cce41a9 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 -- cgit v1.2.3-54-g00ecf