summaryrefslogtreecommitdiff
path: root/meta/conf/distro/include
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2014-05-06 00:32:50 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-06 21:31:57 +0100
commit82813d27640549255dc81a15d7fb63688431f747 (patch)
tree170ca0304a97c1eae6a997d3e8f08fee0df9f3aa /meta/conf/distro/include
parent4a9595dc704012b21f7bb272b82a8a4d548e347f (diff)
downloadopenembedded-core-82813d27640549255dc81a15d7fb63688431f747.tar.gz
openembedded-core-82813d27640549255dc81a15d7fb63688431f747.tar.bz2
openembedded-core-82813d27640549255dc81a15d7fb63688431f747.zip
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@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/distro/include')
-rw-r--r--meta/conf/distro/include/tcmode-default.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 03742d8299..0e81f06c93 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}"