From ebd905685a339814c36bf658a8e58bf8f457f14e Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denys@ti.com>
Date: Fri, 25 Feb 2011 07:39:16 +0000
Subject: 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>
---
 classes/native.bbclass    | 2 ++
 classes/nativesdk.bbclass | 2 ++
 conf/bitbake.conf         | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/classes/native.bbclass b/classes/native.bbclass
index 000ad61fc4..b8a792f735 100644
--- a/classes/native.bbclass
+++ b/classes/native.bbclass
@@ -37,6 +37,8 @@ CXXFLAGS = "${BUILD_CFLAGS}"
 LDFLAGS = "${BUILD_LDFLAGS}"
 LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE} "
 
+TOOLCHAIN_OPTIONS = ""
+
 STAGING_BINDIR = "${STAGING_BINDIR_NATIVE}"
 STAGING_BINDIR_CROSS = "${STAGING_BINDIR_NATIVE}"
 
diff --git a/classes/nativesdk.bbclass b/classes/nativesdk.bbclass
index 6f2153436a..66893995d0 100644
--- a/classes/nativesdk.bbclass
+++ b/classes/nativesdk.bbclass
@@ -36,6 +36,8 @@ CFLAGS = "${BUILDSDK_CFLAGS}"
 CXXFLAGS = "${BUILDSDK_CFLAGS}"
 LDFLAGS = "${BUILDSDK_LDFLAGS}"
 
+TOOLCHAIN_OPTIONS = ""
+
 # Change to place files in SDKPATH
 prefix = "${SDKPATH}"
 exec_prefix = "${SDKPATH}"
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}"
 
-- 
cgit 1.2.3-korg