From f5b657cd9806475bdb3d59afe1b16c6c8c601b71 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 30 Aug 2012 22:56:13 -0700 Subject: [PATCH] conf/distro, external-toolchain-angstrom: Remove references and use of gcc-cross-intermediate Signed-off-by: Khem Raj --- conf/distro/include/toolchain-external.inc | 1 - conf/distro/include/toolchain-internal.inc | 1 - recipes-devtools/meta/external-toolchain-angstrom.bb | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/conf/distro/include/toolchain-external.inc b/conf/distro/include/toolchain-external.inc index 59b6470..a8b7f53 100644 --- a/conf/distro/include/toolchain-external.inc +++ b/conf/distro/include/toolchain-external.inc @@ -1,7 +1,6 @@ # Toolchain specific virtuals PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "external-toolchain-${TOOLCHAIN_BRAND}" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "external-toolchain-${TOOLCHAIN_BRAND}" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "external-toolchain-${TOOLCHAIN_BRAND}" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "external-toolchain-${TOOLCHAIN_BRAND}" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "external-toolchain-${TOOLCHAIN_BRAND}" #PREFERRED_PROVIDER_linux-libc-headers = "external-toolchain-${TOOLCHAIN_BRAND}" diff --git a/conf/distro/include/toolchain-internal.inc b/conf/distro/include/toolchain-internal.inc index bb1e9ae..4565008 100644 --- a/conf/distro/include/toolchain-internal.inc +++ b/conf/distro/include/toolchain-internal.inc @@ -1,7 +1,6 @@ # Toolchain specific virtuals PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime" diff --git a/recipes-devtools/meta/external-toolchain-angstrom.bb b/recipes-devtools/meta/external-toolchain-angstrom.bb index 8b6110a..4fc0fbf 100644 --- a/recipes-devtools/meta/external-toolchain-angstrom.bb +++ b/recipes-devtools/meta/external-toolchain-angstrom.bb @@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" INHIBIT_DEFAULT_DEPS = "1" @@ -17,7 +17,6 @@ PROVIDES = "\ virtual/${TARGET_PREFIX}gcc \ virtual/${TARGET_PREFIX}g++ \ virtual/${TARGET_PREFIX}gcc-initial \ - virtual/${TARGET_PREFIX}gcc-intermediate \ virtual/${TARGET_PREFIX}binutils \ virtual/${TARGET_PREFIX}libc-for-gcc \ virtual/${TARGET_PREFIX}libc-initial \