summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-09-17 01:02:23 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-09-17 22:25:23 +0100
commit835bc8f5f61709fdb3b284509accc8a04664191f (patch)
tree83c6ada1335f92781890abd5c4de5e9c0540d853
parentabfe8598c35dfccb15505461f9f4ca7f44b50a44 (diff)
downloadpoky-835bc8f5f61709fdb3b284509accc8a04664191f.tar.gz
meta-toolchain: Fix --build CONFIGURE_FLAG and add a target prefix to scripts
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/meta/meta-toolchain.bb10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb
index 91226a9d77..b391f8faf8 100644
--- a/meta/packages/meta/meta-toolchain.bb
+++ b/meta/packages/meta/meta-toolchain.bb
@@ -96,21 +96,21 @@ do_populate_sdk() {
96 rm -f ${SDK_OUTPUT}/${SDKPATH}/lib/*.la 96 rm -f ${SDK_OUTPUT}/${SDKPATH}/lib/*.la
97 97
98 # Setup site file for external use 98 # Setup site file for external use
99 siteconfig=${SDK_OUTPUT}/${SDKPATH}/site-config 99 siteconfig=${SDK_OUTPUT}/${SDKPATH}/site-config-${TARGET_SYS}
100 touch $siteconfig 100 touch $siteconfig
101 for sitefile in ${CONFIG_SITE} ; do 101 for sitefile in ${CONFIG_SITE} ; do
102 cat $sitefile >> $siteconfig 102 cat $sitefile >> $siteconfig
103 done 103 done
104 104
105 # Create environment setup script 105 # Create environment setup script
106 script=${SDK_OUTPUT}/${SDKPATH}/environment-setup 106 script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${TARGET_SYS}
107 touch $script 107 touch $script
108 echo 'export PATH=${SDKPATH}/bin:$PATH' >> $script 108 echo 'export PATH=${SDKPATH}/bin:$PATH' >> $script
109 echo 'export PKG_CONFIG_SYSROOT_DIR=${SDKPATH}/${TARGET_SYS}' >> $script 109 echo 'export PKG_CONFIG_SYSROOT_DIR=${SDKPATH}/${TARGET_SYS}' >> $script
110 echo 'export PKG_CONFIG_PATH=${SDKPATH}/${TARGET_SYS}${libdir}/pkgconfig' >> $script 110 echo 'export PKG_CONFIG_PATH=${SDKPATH}/${TARGET_SYS}${libdir}/pkgconfig' >> $script
111 echo 'export CONFIG_SITE=${SDKPATH}/site-config' >> $script 111 echo 'export CONFIG_SITE=${SDKPATH}/site-config-${TARGET_SYS}' >> $script
112 echo 'export CC=${TARGET_PREFIX}gcc' >> $script 112 echo 'export CC=${TARGET_PREFIX}gcc' >> $script
113 echo 'export CONFIGURE_FLAGS="--target=${TARGET_SYS} --host=${TARGET_SYS} --build=${BUILD_SYS}"' >> $script 113 echo 'export CONFIGURE_FLAGS="--target=${TARGET_SYS} --host=${TARGET_SYS} --build=${SDK_ARCH}-linux"' >> $script
114 if [ "${TARGET_OS}" = "darwin8" ]; then 114 if [ "${TARGET_OS}" = "darwin8" ]; then
115 echo 'export TARGET_CFLAGS="-I${SDKPATH}/${TARGET_SYS}${includedir}"' >> $script 115 echo 'export TARGET_CFLAGS="-I${SDKPATH}/${TARGET_SYS}${includedir}"' >> $script
116 echo 'export TARGET_LDFLAGS="-L${SDKPATH}/${TARGET_SYS}${libdir}"' >> $script 116 echo 'export TARGET_LDFLAGS="-L${SDKPATH}/${TARGET_SYS}${libdir}"' >> $script
@@ -122,7 +122,7 @@ do_populate_sdk() {
122 echo "alias opkg-target='LD_LIBRARY_PATH=${SDKPATH}/lib ${SDKPATH}/bin/opkg-cl -f ${SDKPATH}/${TARGET_SYS}${sysconfdir}/opkg.conf -o ${SDKPATH}/${TARGET_SYS}'" >> $script 122 echo "alias opkg-target='LD_LIBRARY_PATH=${SDKPATH}/lib ${SDKPATH}/bin/opkg-cl -f ${SDKPATH}/${TARGET_SYS}${sysconfdir}/opkg.conf -o ${SDKPATH}/${TARGET_SYS}'" >> $script
123 123
124 # Add version information 124 # Add version information
125 versionfile=${SDK_OUTPUT}/${SDKPATH}/version 125 versionfile=${SDK_OUTPUT}/${SDKPATH}/version-${TARGET_SYS}
126 touch $versionfile 126 touch $versionfile
127 echo 'Distro: ${DISTRO}' >> $versionfile 127 echo 'Distro: ${DISTRO}' >> $versionfile
128 echo 'Distro Version: ${DISTRO_VERSION}' >> $versionfile 128 echo 'Distro Version: ${DISTRO_VERSION}' >> $versionfile