summaryrefslogtreecommitdiffstats
path: root/meta/conf
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:32:03 +0100
commit59ef9768399f50ecc10e148950bb434698cac3c0 (patch)
treebc6ae5e474bfe0801c96db0df017f73405b94a55 /meta/conf
parente6e7c28fb716f1636f707130b89323fe5e8cc5ce (diff)
downloadpoky-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')
-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%"
30LINUXLIBCVERSION ?= "3.14" 30LINUXLIBCVERSION ?= "3.14"
31 31
32PREFERRED_VERSION_gcc ?= "${GCCVERSION}" 32PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
33PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}" 33PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
34PREFERRED_VERSION_gcc-cross-initial ?= "${GCCVERSION}" 34PREFERRED_VERSION_gcc-cross-initial-${TARGET_ARCH} ?= "${GCCVERSION}"
35PREFERRED_VERSION_gcc-cross-intermediate ?= "${GCCVERSION}"
36PREFERRED_VERSION_gcc-crosssdk ?= "${SDKGCCVERSION}" 35PREFERRED_VERSION_gcc-crosssdk ?= "${SDKGCCVERSION}"
37PREFERRED_VERSION_gcc-crosssdk-initial ?= "${SDKGCCVERSION}" 36PREFERRED_VERSION_gcc-crosssdk-initial ?= "${SDKGCCVERSION}"
38PREFERRED_VERSION_gcc-crosssdk-intermediate ?= "${SDKGCCVERSION}" 37PREFERRED_VERSION_gcc-crosssdk-intermediate ?= "${SDKGCCVERSION}"
@@ -40,9 +39,10 @@ PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}
40PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}" 39PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}"
41PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}" 40PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}"
42PREFERRED_VERSION_libgcc ?= "${GCCVERSION}" 41PREFERRED_VERSION_libgcc ?= "${GCCVERSION}"
42PREFERRED_VERSION_libgcc-initial ?= "${GCCVERSION}"
43PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}" 43PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}"
44PREFERRED_VERSION_binutils ?= "${BINUVERSION}" 44PREFERRED_VERSION_binutils ?= "${BINUVERSION}"
45PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}" 45PREFERRED_VERSION_binutils-cross-${TARGET_ARCH} ?= "${BINUVERSION}"
46PREFERRED_VERSION_binutils-crosssdk ?= "${BINUVERSION}" 46PREFERRED_VERSION_binutils-crosssdk ?= "${BINUVERSION}"
47PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${BINUVERSION}" 47PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${BINUVERSION}"
48PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}" 48PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"