Skip to content
Snippets Groups Projects
Commit 25501861 authored by Samuli Piippo's avatar Samuli Piippo
Browse files

gcc: make sure mingw build use mingw32-w64 configs


config/os/mingw32-w64 enables features that are disabled in
config/os/mingw32 due to old bugs that are fixed in w64.

Needed to build nativesdk-cmake for mingw:
error: 'to_wstring' is not a member of 'std'

Change-Id: I1823e8bc307403ce54137681cdec66c35109c473
Reviewed-by: default avatarMikko Gronoff <mikko.gronoff@qt.io>
parent c2fbdd18
No related branches found
No related tags found
No related merge requests found
......@@ -28,4 +28,7 @@
############################################################################
FILESEXTRAPATHS_append := "${THISDIR}/gcc:"
SRC_URI += "file://0001-PR-c-88568.patch"
SRC_URI += "\
file://0001-PR-c-88568.patch \
file://0001-Always-use-config-os-mingw32-w64-for-mingw-builds.patch \
"
From 052f7e5db0d793155015530b639c4e42d37eb7eb Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri, 23 Aug 2019 10:10:43 +0300
Subject: [PATCH] Always use config/os/mingw32-w64 for mingw builds
Make sure we use the w64 version of the configs, since that's what
meta-mingw is using.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
---
libstdc++-v3/configure.host | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
index 155a3cdea..adbda8784 100644
--- a/libstdc++-v3/configure.host
+++ b/libstdc++-v3/configure.host
@@ -277,16 +277,8 @@ case "${host_os}" in
os_include_dir="os/hpux"
;;
mingw32*)
- case "$host" in
- *-w64-*)
- os_include_dir="os/mingw32-w64"
- error_constants_dir="os/mingw32-w64"
- ;;
- *)
- os_include_dir="os/mingw32"
- error_constants_dir="os/mingw32"
- ;;
- esac
+ os_include_dir="os/mingw32-w64"
+ error_constants_dir="os/mingw32-w64"
OPT_LDFLAGS="${OPT_LDFLAGS} \$(lt_host_flags)"
;;
netbsd*)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment