From 835bc8f5f61709fdb3b284509accc8a04664191f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 17 Sep 2009 01:02:23 +0100 Subject: meta-toolchain: Fix --build CONFIGURE_FLAG and add a target prefix to scripts Signed-off-by: Richard Purdie --- meta/packages/meta/meta-toolchain.bb | 10 +++++----- 1 file 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() { rm -f ${SDK_OUTPUT}/${SDKPATH}/lib/*.la # Setup site file for external use - siteconfig=${SDK_OUTPUT}/${SDKPATH}/site-config + siteconfig=${SDK_OUTPUT}/${SDKPATH}/site-config-${TARGET_SYS} touch $siteconfig for sitefile in ${CONFIG_SITE} ; do cat $sitefile >> $siteconfig done # Create environment setup script - script=${SDK_OUTPUT}/${SDKPATH}/environment-setup + script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${TARGET_SYS} touch $script echo 'export PATH=${SDKPATH}/bin:$PATH' >> $script echo 'export PKG_CONFIG_SYSROOT_DIR=${SDKPATH}/${TARGET_SYS}' >> $script echo 'export PKG_CONFIG_PATH=${SDKPATH}/${TARGET_SYS}${libdir}/pkgconfig' >> $script - echo 'export CONFIG_SITE=${SDKPATH}/site-config' >> $script + echo 'export CONFIG_SITE=${SDKPATH}/site-config-${TARGET_SYS}' >> $script echo 'export CC=${TARGET_PREFIX}gcc' >> $script - echo 'export CONFIGURE_FLAGS="--target=${TARGET_SYS} --host=${TARGET_SYS} --build=${BUILD_SYS}"' >> $script + echo 'export CONFIGURE_FLAGS="--target=${TARGET_SYS} --host=${TARGET_SYS} --build=${SDK_ARCH}-linux"' >> $script if [ "${TARGET_OS}" = "darwin8" ]; then echo 'export TARGET_CFLAGS="-I${SDKPATH}/${TARGET_SYS}${includedir}"' >> $script echo 'export TARGET_LDFLAGS="-L${SDKPATH}/${TARGET_SYS}${libdir}"' >> $script @@ -122,7 +122,7 @@ do_populate_sdk() { 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 # Add version information - versionfile=${SDK_OUTPUT}/${SDKPATH}/version + versionfile=${SDK_OUTPUT}/${SDKPATH}/version-${TARGET_SYS} touch $versionfile echo 'Distro: ${DISTRO}' >> $versionfile echo 'Distro Version: ${DISTRO_VERSION}' >> $versionfile -- cgit v1.2.3-54-g00ecf