diff options
author | Khem Raj <raj.khem@gmail.com> | 2014-05-06 00:32:50 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-06 21:32:03 +0100 |
commit | 59ef9768399f50ecc10e148950bb434698cac3c0 (patch) | |
tree | bc6ae5e474bfe0801c96db0df017f73405b94a55 /meta/conf/distro | |
parent | e6e7c28fb716f1636f707130b89323fe5e8cc5ce (diff) | |
download | poky-59ef9768399f50ecc10e148950bb434698cac3c0.tar.gz |
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
(From OE-Core rev: 82813d27640549255dc81a15d7fb63688431f747)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/distro')
-rw-r--r-- | meta/conf/distro/include/tcmode-default.inc | 8 |
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%" | |||
30 | LINUXLIBCVERSION ?= "3.14" | 30 | LINUXLIBCVERSION ?= "3.14" |
31 | 31 | ||
32 | PREFERRED_VERSION_gcc ?= "${GCCVERSION}" | 32 | PREFERRED_VERSION_gcc ?= "${GCCVERSION}" |
33 | PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}" | 33 | PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" |
34 | PREFERRED_VERSION_gcc-cross-initial ?= "${GCCVERSION}" | 34 | PREFERRED_VERSION_gcc-cross-initial-${TARGET_ARCH} ?= "${GCCVERSION}" |
35 | PREFERRED_VERSION_gcc-cross-intermediate ?= "${GCCVERSION}" | ||
36 | PREFERRED_VERSION_gcc-crosssdk ?= "${SDKGCCVERSION}" | 35 | PREFERRED_VERSION_gcc-crosssdk ?= "${SDKGCCVERSION}" |
37 | PREFERRED_VERSION_gcc-crosssdk-initial ?= "${SDKGCCVERSION}" | 36 | PREFERRED_VERSION_gcc-crosssdk-initial ?= "${SDKGCCVERSION}" |
38 | PREFERRED_VERSION_gcc-crosssdk-intermediate ?= "${SDKGCCVERSION}" | 37 | PREFERRED_VERSION_gcc-crosssdk-intermediate ?= "${SDKGCCVERSION}" |
@@ -40,9 +39,10 @@ PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION} | |||
40 | PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}" | 39 | PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}" |
41 | PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}" | 40 | PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}" |
42 | PREFERRED_VERSION_libgcc ?= "${GCCVERSION}" | 41 | PREFERRED_VERSION_libgcc ?= "${GCCVERSION}" |
42 | PREFERRED_VERSION_libgcc-initial ?= "${GCCVERSION}" | ||
43 | PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}" | 43 | PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}" |
44 | PREFERRED_VERSION_binutils ?= "${BINUVERSION}" | 44 | PREFERRED_VERSION_binutils ?= "${BINUVERSION}" |
45 | PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}" | 45 | PREFERRED_VERSION_binutils-cross-${TARGET_ARCH} ?= "${BINUVERSION}" |
46 | PREFERRED_VERSION_binutils-crosssdk ?= "${BINUVERSION}" | 46 | PREFERRED_VERSION_binutils-crosssdk ?= "${BINUVERSION}" |
47 | PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${BINUVERSION}" | 47 | PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${BINUVERSION}" |
48 | PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}" | 48 | PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}" |