diff options
| author | laanwj <126646+laanwj@users.noreply.github.com> | 2022-01-07 21:02:25 +0100 |
|---|---|---|
| committer | laanwj <126646+laanwj@users.noreply.github.com> | 2022-01-07 21:05:30 +0100 |
| commit | 018fd9620293582f0ce43d344ac3110e19c4dedc (patch) | |
| tree | 0a39d962144c0b4808e433569b52b2ad836123a1 /depends/hosts | |
| parent | 711ce2e5333bd6717f9b114abe7ec1d1994afbc4 (diff) | |
| parent | 2fda0c785188ae94fba921c1b8f6f2c005faf1d4 (diff) | |
| download | bitcoin-018fd9620293582f0ce43d344ac3110e19c4dedc.tar.xz | |
Merge bitcoin/bitcoin#22093: build: Try posix-specific CXX first for mingw32 host
2fda0c785188ae94fba921c1b8f6f2c005faf1d4 doc: Drop no longer required notes for Windows builds (Hennadii Stepanov)
f09ed92be132ebcb91b459c87d640a14b4b54336 build: Try posix-specific CXX first for mingw32 host (Hennadii Stepanov)
Pull request description:
On master (1186910b6b7ba7c7e5193c76f33f25825e6cc0b7), when cross-compiling for Windows using our depends build system, we must manually choose the POSIX thread model for the `x86_64-w64-mingw32-g++` compiler.
This PR improves the build system to make this choice automa**g**ically.
ACKs for top commit:
jarolrod:
re-ACK 2fda0c785188ae94fba921c1b8f6f2c005faf1d4
shaavan:
tACK 2fda0c785188ae94fba921c1b8f6f2c005faf1d4
Tree-SHA512: ad3bbdfe84b3c8eb56e102aa0abdc76fd864b2724ac59c9a12a798c57d1c5a1172682172588019d5d1715801a9f201fd9424effbd858e8dc30607c23c0d5941f
Diffstat (limited to 'depends/hosts')
| -rw-r--r-- | depends/hosts/mingw32.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/depends/hosts/mingw32.mk b/depends/hosts/mingw32.mk index be5fec570c..92fd1b81bf 100644 --- a/depends/hosts/mingw32.mk +++ b/depends/hosts/mingw32.mk @@ -1,3 +1,7 @@ +ifneq ($(shell which $(host)-g++-posix),) +mingw32_CXX := $(host)-g++-posix +endif + mingw32_CFLAGS=-pipe mingw32_CXXFLAGS=$(mingw32_CFLAGS) |