[oe-commits] Khem Raj : tcmode-default.inc: Adjust for new toolchain component changes

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 82813d27640549255dc81a15d7fb63688431f747
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=82813d27640549255dc81a15d7fb63688431f747

Author: Khem Raj <raj.khem at gmail.com>
Date:   Tue May  6 00:32:50 2014 -0700

tcmode-default.inc: Adjust for new toolchain component changes

Recently we renames the cross compilers as well as spun out
libgcc-initial from gcc-initial out. We need to also express
it in default tcmode otherwise defining GCCVERSION and/or BINUVERSION
outside OE-Core does not cover all cases

Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/conf/distro/include/tcmode-default.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 03742d8..0e81f06 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -30,9 +30,8 @@ UCLIBCVERSION ?= "0.9.33+git%"
 LINUXLIBCVERSION ?= "3.14"
 
 PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
-PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}"
-PREFERRED_VERSION_gcc-cross-initial ?= "${GCCVERSION}"
-PREFERRED_VERSION_gcc-cross-intermediate ?= "${GCCVERSION}"
+PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
+PREFERRED_VERSION_gcc-cross-initial-${TARGET_ARCH} ?= "${GCCVERSION}"
 PREFERRED_VERSION_gcc-crosssdk ?= "${SDKGCCVERSION}"
 PREFERRED_VERSION_gcc-crosssdk-initial ?= "${SDKGCCVERSION}"
 PREFERRED_VERSION_gcc-crosssdk-intermediate ?= "${SDKGCCVERSION}"
@@ -40,9 +39,10 @@ PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}
 PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}"
 PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}"
 PREFERRED_VERSION_libgcc ?= "${GCCVERSION}"
+PREFERRED_VERSION_libgcc-initial ?= "${GCCVERSION}"
 PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}"
 PREFERRED_VERSION_binutils ?= "${BINUVERSION}"
-PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}"
+PREFERRED_VERSION_binutils-cross-${TARGET_ARCH} ?= "${BINUVERSION}"
 PREFERRED_VERSION_binutils-crosssdk ?= "${BINUVERSION}"
 PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${BINUVERSION}"
 PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"