diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2020-09-18 15:29:51 +0300 |
|---|---|---|
| committer | Joshua Watt <JPEWhacker@gmail.com> | 2020-09-23 14:35:11 -0500 |
| commit | 54d41d1f5dccfcb0f2d8d387a8f081d549970d07 (patch) | |
| tree | bf1ab585321287f68d3f5ea8c5b8d6a715cf6d5c | |
| parent | 524de686205b5d6736661d4532f5f98fee8589b7 (diff) | |
Override SDK_VENDORupstream/dunfell-next
Set SDK_VENDOR to '-w64', which makes the host triplet match what GCC
expect to find when using mingw32-w64. This enables features that are
not functional in the classic mingw32, but have been implemented in the
mingw32-w64.
Disable 32bit libs from the runtime component when compiling for 64bit,
which were enabled as a side effect of the GCC config change.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
(cherry picked from commit b7d37809364f5928777eb26a33a4f7949c18aa42)
| -rw-r--r-- | conf/machine-sdk/include/mingw32-common.inc | 3 | ||||
| -rw-r--r-- | recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_6.0.0.bb | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/conf/machine-sdk/include/mingw32-common.inc b/conf/machine-sdk/include/mingw32-common.inc index 9011ded..bc6c91e 100644 --- a/conf/machine-sdk/include/mingw32-common.inc +++ b/conf/machine-sdk/include/mingw32-common.inc @@ -1,4 +1,7 @@ SDK_OS = "mingw32" +SDK_VENDOR_mingw32 = "-w64" +SDK_VENDOR_sdkmingw32 = "-w64" + NATIVESDKLIBC = "libc-mingw" PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc_mingw32 = "nativesdk-mingw-w64-runtime" diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_6.0.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_6.0.0.bb index cf39c6a..9f79ffe 100644 --- a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_6.0.0.bb +++ b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_6.0.0.bb @@ -19,6 +19,8 @@ PROVIDES += "virtual/nativesdk-libintl" TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" +EXTRA_OECONF_x86-64 = "--disable-lib32" + do_configure() { oe_runconf } |