summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-10-13 17:41:29 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-10-13 17:41:29 +0100
commitb2c3ce6d17520d43b10777dd306449876cb40819 (patch)
tree1eff9f09fd2dd326c68f1419140f1caf792269c6 /meta/classes
parent271bd9d8f97ca14e931b45513f6eaa6ed9e9a675 (diff)
downloadpoky-b2c3ce6d17520d43b10777dd306449876cb40819.tar.gz
meta-toolchain: Update the way ld.so.cache is handled
Fix the library search path so that libs in the toolchain in /opt/ have priority over those in base system but ones from the base system can still be found. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/toolchain-scripts.bbclass4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index c393d99644..9c6fe67d49 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -6,6 +6,10 @@ 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
9 echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/${MULTIMACH_TARGET_SYS}:$PATH' >> $script 13 echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/${MULTIMACH_TARGET_SYS}:$PATH' >> $script
10 echo 'export PKG_CONFIG_SYSROOT_DIR=${SDKTARGETSYSROOT}' >> $script 14 echo 'export PKG_CONFIG_SYSROOT_DIR=${SDKTARGETSYSROOT}' >> $script
11 echo 'export PKG_CONFIG_PATH=${SDKTARGETSYSROOT}${libdir}/pkgconfig' >> $script 15 echo 'export PKG_CONFIG_PATH=${SDKTARGETSYSROOT}${libdir}/pkgconfig' >> $script