aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2011-02-25 07:39:16 +0000
committerDenys Dmytriyenko <denys@ti.com>2011-02-24 21:05:56 -0500
commitebd905685a339814c36bf658a8e58bf8f457f14e (patch)
treef0ba5d1c1713f7c69379a594471fdee6da00be68 /conf
parent2ee7e82e8ff5b7c12edc978d68d5163dd55d8d13 (diff)
downloadopenembedded-ebd905685a339814c36bf658a8e58bf8f457f14e.tar.gz
openembedded-ebd905685a339814c36bf658a8e58bf8f457f14e.tar.bz2
openembedded-ebd905685a339814c36bf658a8e58bf8f457f14e.zip
bitbake.conf, native*.bbclass: pass --sysroot to TOOLCHAIN_OPTIONS
Commit 9c5b9db29738a89837917b1a2d8ee5a1cae0b4cc (bitbake.conf: Simplify TARGET_CPPFLAGS/LDFLAGS) potentially breaks external toolchains, when their default sysroot is different from our sysroot/staging location. Pass default --sysroot to compiler/linker through TOOLCHAIN_OPTIONS, avoiding native and nativesdk packages. This matches the corresponding changes in Poky. cross.bbclass was already doing it, since it originated from Poky, AFAIK. Signed-off-by: Denys Dmytriyenko <denys@ti.com> Acked-by: Tom Rini <tom_rini@mentor.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 34f77260d0..1002c01a06 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -460,7 +460,7 @@ export PATH
##################################################################
CCACHE ?= ""
-TOOLCHAIN_OPTIONS = ""
+TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}"
TOOLCHAIN_PATH ?= "${STAGING_DIR_NATIVE}${prefix_native}/${BASE_PACKAGE_ARCH}"
TOOLCHAIN_SYSPATH ?= "${TOOLCHAIN_PATH}/${TARGET_SYS}"