diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-07 10:28:08 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-07 10:29:58 +0100 |
| commit | 9392fa8a7bf3a0b012a7759c1b629f2ee46a71a8 (patch) | |
| tree | f05cb4cd20bb2d7ad34240b5089949cfc57ea296 /meta/conf | |
| parent | 59ef9768399f50ecc10e148950bb434698cac3c0 (diff) | |
| download | poky-9392fa8a7bf3a0b012a7759c1b629f2ee46a71a8.tar.gz | |
tcmode-default: Fix up sdk related PREFERRED_VERSION variables after toolchain changes
Also drop an obsolete gcc-cross-intermediate reference.
(From OE-Core rev: d807e87708d5e4dc9267aa1611ba7ad7beec1d40)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
| -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 0e81f06c93..23e8857ac0 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc | |||
| @@ -32,18 +32,18 @@ LINUXLIBCVERSION ?= "3.14" | |||
| 32 | PREFERRED_VERSION_gcc ?= "${GCCVERSION}" | 32 | PREFERRED_VERSION_gcc ?= "${GCCVERSION}" |
| 33 | PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" | 33 | PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" |
| 34 | PREFERRED_VERSION_gcc-cross-initial-${TARGET_ARCH} ?= "${GCCVERSION}" | 34 | PREFERRED_VERSION_gcc-cross-initial-${TARGET_ARCH} ?= "${GCCVERSION}" |
| 35 | PREFERRED_VERSION_gcc-crosssdk ?= "${SDKGCCVERSION}" | 35 | PREFERRED_VERSION_gcc-crosssdk-${SDK_ARCH} ?= "${SDKGCCVERSION}" |
| 36 | PREFERRED_VERSION_gcc-crosssdk-initial ?= "${SDKGCCVERSION}" | 36 | PREFERRED_VERSION_gcc-crosssdk-initial-${SDK_ARCH} ?= "${SDKGCCVERSION}" |
| 37 | PREFERRED_VERSION_gcc-crosssdk-intermediate ?= "${SDKGCCVERSION}" | ||
| 38 | PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}" | 37 | PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}" |
| 39 | PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}" | 38 | PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}" |
| 40 | PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}" | 39 | PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}" |
| 41 | PREFERRED_VERSION_libgcc ?= "${GCCVERSION}" | 40 | PREFERRED_VERSION_libgcc ?= "${GCCVERSION}" |
| 42 | PREFERRED_VERSION_libgcc-initial ?= "${GCCVERSION}" | 41 | PREFERRED_VERSION_libgcc-initial ?= "${GCCVERSION}" |
| 43 | PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}" | 42 | PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}" |
| 43 | PREFERRED_VERSION_nativesdk-libgcc-initial ?= "${SDKGCCVERSION}" | ||
| 44 | PREFERRED_VERSION_binutils ?= "${BINUVERSION}" | 44 | PREFERRED_VERSION_binutils ?= "${BINUVERSION}" |
| 45 | PREFERRED_VERSION_binutils-cross-${TARGET_ARCH} ?= "${BINUVERSION}" | 45 | PREFERRED_VERSION_binutils-cross-${TARGET_ARCH} ?= "${BINUVERSION}" |
| 46 | PREFERRED_VERSION_binutils-crosssdk ?= "${BINUVERSION}" | 46 | PREFERRED_VERSION_binutils-crosssdk-${SDK_ARCH} ?= "${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}" |
| 49 | PREFERRED_VERSION_nativesdk-linux-libc-headers ?= "${LINUXLIBCVERSION}" | 49 | PREFERRED_VERSION_nativesdk-linux-libc-headers ?= "${LINUXLIBCVERSION}" |