diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-10-14 11:42:37 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-10-14 11:46:39 +0100 |
commit | 9eb2de9163791e1cf02a1fbf94da1ed55d8378c5 (patch) | |
tree | a269d48a8a52c939060e8d0cd67833ec5b9c38dc /meta/classes/toolchain-scripts.bbclass | |
parent | a2337a34358b017a3e4311a2647165da2d8b54d3 (diff) | |
download | poky-9eb2de9163791e1cf02a1fbf94da1ed55d8378c5.tar.gz |
Revert "meta-toolchain: Update the way ld.so.cache is handled"
This change didn't work as expected as ld.so.cache doesn't preseve any search
path ordering, therefore revert the change.
This reverts commit b2c3ce6d17520d43b10777dd306449876cb40819.
Diffstat (limited to 'meta/classes/toolchain-scripts.bbclass')
-rw-r--r-- | meta/classes/toolchain-scripts.bbclass | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index 9c6fe67d49..c393d99644 100644 --- a/meta/classes/toolchain-scripts.bbclass +++ b/meta/classes/toolchain-scripts.bbclass | |||
@@ -6,10 +6,6 @@ toolchain_create_sdk_env_script () { | |||
6 | script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${MULTIMACH_TARGET_SYS} | 6 | script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${MULTIMACH_TARGET_SYS} |
7 | rm -f $script | 7 | rm -f $script |
8 | touch $script | 8 | touch $script |
9 | echo 'if [ ! -e ${SDKPATHNATIVE}/etc/ld.so.cache ]; then' >> $script | ||
10 | echo ' echo "Please run ${SDKPATH}/postinstall as root before using the toolchain"' >> $script | ||
11 | echo ' exit 1' >> $script | ||
12 | echo 'fi' >> $script | ||
13 | echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/${MULTIMACH_TARGET_SYS}:$PATH' >> $script | 9 | echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/${MULTIMACH_TARGET_SYS}:$PATH' >> $script |
14 | echo 'export PKG_CONFIG_SYSROOT_DIR=${SDKTARGETSYSROOT}' >> $script | 10 | echo 'export PKG_CONFIG_SYSROOT_DIR=${SDKTARGETSYSROOT}' >> $script |
15 | echo 'export PKG_CONFIG_PATH=${SDKTARGETSYSROOT}${libdir}/pkgconfig' >> $script | 11 | echo 'export PKG_CONFIG_PATH=${SDKTARGETSYSROOT}${libdir}/pkgconfig' >> $script |