From d9bd9e36188ffe9169739e75438b309528cf4660 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 30 Apr 2014 15:41:20 +0000 Subject: mingw32: Update after compiler suffix changes Signed-off-by: Richard Purdie --- conf/machine-sdk/i686-mingw32.conf | 2 +- conf/machine-sdk/x86_64-mingw32.conf | 2 +- recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_2.0.8.bb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/machine-sdk/i686-mingw32.conf b/conf/machine-sdk/i686-mingw32.conf index 586bfe3..d302660 100644 --- a/conf/machine-sdk/i686-mingw32.conf +++ b/conf/machine-sdk/i686-mingw32.conf @@ -3,7 +3,7 @@ SDK_OS = "mingw32" GCCTHREADS_mingw32 = "win32" -PREFERRED_PROVIDER_virtual/${SDK_SYS}-binutils-crosssdk = "binutils-crosssdk" +PREFERRED_PROVIDER_virtual/${SDK_SYS}-binutils-crosssdk = "binutils-crosssdk-${SDK_ARCH}" PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc = "nativesdk-mingw-w64-runtime" PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime" PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-mingw-w64-runtime" diff --git a/conf/machine-sdk/x86_64-mingw32.conf b/conf/machine-sdk/x86_64-mingw32.conf index 7d1c016..3c6a3c5 100644 --- a/conf/machine-sdk/x86_64-mingw32.conf +++ b/conf/machine-sdk/x86_64-mingw32.conf @@ -3,7 +3,7 @@ SDK_OS = "mingw32" GCCTHREADS_mingw32 = "win32" -PREFERRED_PROVIDER_virtual/${SDK_SYS}-binutils-crosssdk = "binutils-crosssdk" +PREFERRED_PROVIDER_virtual/${SDK_SYS}-binutils-crosssdk = "binutils-crosssdk-${SDK_ARCH}" PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc = "nativesdk-mingw-w64-runtime" PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime" PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-mingw-w64-runtime" diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_2.0.8.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_2.0.8.bb index 362b24a..14b5c7d 100644 --- a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_2.0.8.bb +++ b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_2.0.8.bb @@ -23,8 +23,8 @@ PROVIDES += "virtual/nativesdk-${SDK_PREFIX}libc-for-gcc" # Work around pulling in eglibc for now... PROVIDES += "virtual/nativesdk-libintl" -STAGINGCC = "gcc-cross-initial" -STAGINGCC_class-nativesdk = "gcc-crosssdk-initial" +STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" +STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${TARGET_ARCH}" TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" -- cgit v1.2.3-54-g00ecf