summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-11-22 18:05:06 +0000
committerRichard Purdie <richard@openedhand.com>2007-11-22 18:05:06 +0000
commit0138501213f140198abdead3ffa6b3ba80462c98 (patch)
tree4720bec98938f740a4bb8b88ebdba1bbf4cbabf7 /meta
parent066e96a9bab0b9889b7935f9a1eb4cfc5b157c7b (diff)
downloadpoky-0138501213f140198abdead3ffa6b3ba80462c98.tar.gz
poky-external.inc: Change the way the sysroot option is passed about to deal with libtool
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3208 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/bitbake.conf11
-rw-r--r--meta/conf/distro/include/poky-external.inc5
2 files changed, 9 insertions, 7 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 166d986862..31e3e2979b 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -297,12 +297,13 @@ export PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${layout_sbi
297################################################################## 297##################################################################
298 298
299CCACHE = "${@bb.which(bb.data.getVar('PATH', d), 'ccache') and 'ccache '}" 299CCACHE = "${@bb.which(bb.data.getVar('PATH', d), 'ccache') and 'ccache '}"
300TOOLCHAIN_OPTIONS = ""
300 301
301export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" 302export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
302export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}" 303export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
303export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}" 304export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
304export CPP = "${HOST_PREFIX}gcc -E" 305export CPP = "${HOST_PREFIX}gcc -E${TOOLCHAIN_OPTIONS}"
305export LD = "${HOST_PREFIX}ld" 306export LD = "${HOST_PREFIX}ld${TOOLCHAIN_OPTIONS}"
306export CCLD = "${CC}" 307export CCLD = "${CC}"
307export AR = "${HOST_PREFIX}ar" 308export AR = "${HOST_PREFIX}ar"
308export AS = "${HOST_PREFIX}as" 309export AS = "${HOST_PREFIX}as"
diff --git a/meta/conf/distro/include/poky-external.inc b/meta/conf/distro/include/poky-external.inc
index f95340b3aa..50b250bcee 100644
--- a/meta/conf/distro/include/poky-external.inc
+++ b/meta/conf/distro/include/poky-external.inc
@@ -23,7 +23,8 @@ PREFERRED_PROVIDER_virtual/libiconv = "external-poky-toolchain"
23PREFERRED_PROVIDER_glibc-thread-db = "external-poky-toolchain" 23PREFERRED_PROVIDER_glibc-thread-db = "external-poky-toolchain"
24PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-poky-toolchain" 24PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-poky-toolchain"
25 25
26TARGET_CPPFLAGS_prepend = " -isystem${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/include --sysroot=${STAGING_DIR_HOST} " 26TARGET_CPPFLAGS_prepend = " -isystem${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/include "
27TARGET_LDFLAGS_prepend = " -L${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib -Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib --sysroot=${STAGING_DIR_HOST} " 27TARGET_LDFLAGS_prepend = " -L${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib -Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib "
28TARGET_CFLAGS = "${TARGET_CPPFLAGS} ${SELECTED_OPTIMIZATION}" 28TARGET_CFLAGS = "${TARGET_CPPFLAGS} ${SELECTED_OPTIMIZATION}"
29 29
30TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_HOST}"