diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-30 15:41:20 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-30 15:41:20 +0000 |
commit | d9bd9e36188ffe9169739e75438b309528cf4660 (patch) | |
tree | 06d6562b21c62c985129cf1b49d96e35e4f07fa7 | |
parent | bfc9fefde84abb723862f90016064a976dbf056e (diff) | |
download | meta-mingw-d9bd9e36188ffe9169739e75438b309528cf4660.tar.gz |
mingw32: Update after compiler suffix changes
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | conf/machine-sdk/i686-mingw32.conf | 2 | ||||
-rw-r--r-- | conf/machine-sdk/x86_64-mingw32.conf | 2 | ||||
-rw-r--r-- | 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" | |||
3 | 3 | ||
4 | GCCTHREADS_mingw32 = "win32" | 4 | GCCTHREADS_mingw32 = "win32" |
5 | 5 | ||
6 | PREFERRED_PROVIDER_virtual/${SDK_SYS}-binutils-crosssdk = "binutils-crosssdk" | 6 | PREFERRED_PROVIDER_virtual/${SDK_SYS}-binutils-crosssdk = "binutils-crosssdk-${SDK_ARCH}" |
7 | PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc = "nativesdk-mingw-w64-runtime" | 7 | PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc = "nativesdk-mingw-w64-runtime" |
8 | PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime" | 8 | PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime" |
9 | PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-mingw-w64-runtime" | 9 | 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" | |||
3 | 3 | ||
4 | GCCTHREADS_mingw32 = "win32" | 4 | GCCTHREADS_mingw32 = "win32" |
5 | 5 | ||
6 | PREFERRED_PROVIDER_virtual/${SDK_SYS}-binutils-crosssdk = "binutils-crosssdk" | 6 | PREFERRED_PROVIDER_virtual/${SDK_SYS}-binutils-crosssdk = "binutils-crosssdk-${SDK_ARCH}" |
7 | PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc = "nativesdk-mingw-w64-runtime" | 7 | PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc = "nativesdk-mingw-w64-runtime" |
8 | PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime" | 8 | PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime" |
9 | PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-mingw-w64-runtime" | 9 | 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" | |||
23 | # Work around pulling in eglibc for now... | 23 | # Work around pulling in eglibc for now... |
24 | PROVIDES += "virtual/nativesdk-libintl" | 24 | PROVIDES += "virtual/nativesdk-libintl" |
25 | 25 | ||
26 | STAGINGCC = "gcc-cross-initial" | 26 | STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" |
27 | STAGINGCC_class-nativesdk = "gcc-crosssdk-initial" | 27 | STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${TARGET_ARCH}" |
28 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" | 28 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" |
29 | PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" | 29 | PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" |
30 | 30 | ||