1 files changed, 12 insertions, 11 deletions
diff --git a/meta/conf/external_toolchain.conf b/meta/conf/external_toolchain.conf
index e114f342ca..b5bf220dc5 100644
--- a/meta/conf/external_toolchain.conf
+++ b/meta/conf/external_toolchain.conf
@@ -4,17 +4,18 @@ EXTERNAL_TOOLCHAIN = "/usr/local/poky/${TARGET_ARCH}"
 PATH =+ ":${EXTERNAL_TOOLCHAIN}/bin:"
-ASSUME_PROVIDED += "\
+PREFERRED_PROVIDER_linux-libc-headers = "external-poky-toolchain"
-    linux-libc-headers \
+PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-gcc = "external-poky-toolchain"
-    virtual/arm-poky-linux-gnueabi-gcc \
+PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-gcc-initial = "external-poky-toolchain"
-    virtual/arm-poky-linux-gnueabi-gcc-initial \
+PREFERRED_PROVIDER_virtual/arm-poky-linux-binutils = "external-poky-toolchain"
-    virtual/arm-poky-linux-binutils \
+PREFERRED_PROVIDER_virtual/arm-poky-linux-libc-for-gcc = "external-poky-toolchain"
-    virtual/arm-poky-linux-libc-for-gcc \
+PREFERRED_PROVIDER_virtual/libc = "external-poky-toolchain"
-    virtual/libc \
+PREFERRED_PROVIDER_virtual/libintl = "external-poky-toolchain"
-    virtual/libintl \
+PREFERRED_PROVIDER_virtual/libiconv = "external-poky-toolchain"
-    virtual/libiconv \
+PREFERRED_PROVIDER_glibc-thread-db = "external-poky-toolchain"
-    glibc-thread-db \
+PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-poky-toolchain"
-    virtual/linux-libc-headers "
 TARGET_CPPFLAGS_append = " -I${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/include "
 TARGET_LDFLAGS_prepend = " -L${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib -Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib "

diff --git a/meta/conf/external_toolchain.conf b/meta/conf/external_toolchain.conf index e114f342ca..b5bf220dc5 100644 --- a/meta/conf/external_toolchain.conf +++ b/meta/conf/external_toolchain.conf
@@ -4,17 +4,18 @@ EXTERNAL_TOOLCHAIN = "/usr/local/poky/${TARGET_ARCH}"
4		4
5	PATH =+ ":${EXTERNAL_TOOLCHAIN}/bin:"	5	PATH =+ ":${EXTERNAL_TOOLCHAIN}/bin:"
6		6
7	ASSUME_PROVIDED += "\	7	PREFERRED_PROVIDER_linux-libc-headers = "external-poky-toolchain"
8	linux-libc-headers \	8	PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-gcc = "external-poky-toolchain"
9	virtual/arm-poky-linux-gnueabi-gcc \	9	PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-gcc-initial = "external-poky-toolchain"
10	virtual/arm-poky-linux-gnueabi-gcc-initial \	10	PREFERRED_PROVIDER_virtual/arm-poky-linux-binutils = "external-poky-toolchain"
11	virtual/arm-poky-linux-binutils \	11	PREFERRED_PROVIDER_virtual/arm-poky-linux-libc-for-gcc = "external-poky-toolchain"
12	virtual/arm-poky-linux-libc-for-gcc \	12	PREFERRED_PROVIDER_virtual/libc = "external-poky-toolchain"
13	virtual/libc \	13	PREFERRED_PROVIDER_virtual/libintl = "external-poky-toolchain"
14	virtual/libintl \	14	PREFERRED_PROVIDER_virtual/libiconv = "external-poky-toolchain"
15	virtual/libiconv \	15	PREFERRED_PROVIDER_glibc-thread-db = "external-poky-toolchain"
16	glibc-thread-db \	16	PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-poky-toolchain"
17	virtual/linux-libc-headers "
18		17
19	TARGET_CPPFLAGS_append = " -I${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/include "	18	TARGET_CPPFLAGS_append = " -I${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/include "
20	TARGET_LDFLAGS_prepend = " -L${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib -Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib "	19	TARGET_LDFLAGS_prepend = " -L${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib -Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib "
		20
		21