From d807e87708d5e4dc9267aa1611ba7ad7beec1d40 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 7 May 2014 10:28:08 +0100 Subject: tcmode-default: Fix up sdk related PREFERRED_VERSION variables after toolchain changes Also drop an obsolete gcc-cross-intermediate reference. Signed-off-by: Richard Purdie --- 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 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" PREFERRED_VERSION_gcc ?= "${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}" +PREFERRED_VERSION_gcc-crosssdk-${SDK_ARCH} ?= "${SDKGCCVERSION}" +PREFERRED_VERSION_gcc-crosssdk-initial-${SDK_ARCH} ?= "${SDKGCCVERSION}" 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_nativesdk-libgcc-initial ?= "${SDKGCCVERSION}" PREFERRED_VERSION_binutils ?= "${BINUVERSION}" PREFERRED_VERSION_binutils-cross-${TARGET_ARCH} ?= "${BINUVERSION}" -PREFERRED_VERSION_binutils-crosssdk ?= "${BINUVERSION}" +PREFERRED_VERSION_binutils-crosssdk-${SDK_ARCH} ?= "${BINUVERSION}" PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${BINUVERSION}" PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}" PREFERRED_VERSION_nativesdk-linux-libc-headers ?= "${LINUXLIBCVERSION}" -- cgit v1.2.3