Skip to content

Commit cc55ebb

Browse files
committed
merge bitcoin#22093: Try posix-specific CXX first for mingw32 host
1 parent 638806b commit cc55ebb

File tree

2 files changed

+4
-31
lines changed

2 files changed

+4
-31
lines changed

depends/hosts/mingw32.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
ifneq ($(shell which $(host)-g++-posix),)
2+
mingw32_CXX := $(host)-g++-posix
3+
endif
4+
15
mingw32_CFLAGS=-pipe
26
mingw32_CXXFLAGS=$(mingw32_CFLAGS)
37

doc/build-windows.md

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -39,27 +39,6 @@ The first step is to install the mingw-w64 cross-compilation tool chain:
3939

4040
sudo apt-get install g++-mingw-w64-x86-64 mingw-w64-x86-64-dev
4141

42-
Next, set the default `mingw32 g++` compiler option to POSIX<sup>[1](#footnote1)</sup>:
43-
44-
```
45-
sudo update-alternatives --config x86_64-w64-mingw32-g++
46-
```
47-
48-
After running the above command, you should see output similar to that below.
49-
Choose the option that ends with `posix`.
50-
51-
```
52-
There are 2 choices for the alternative x86_64-w64-mingw32-g++ (providing /usr/bin/x86_64-w64-mingw32-g++).
53-
54-
Selection Path Priority Status
55-
------------------------------------------------------------
56-
0 /usr/bin/x86_64-w64-mingw32-g++-win32 60 auto mode
57-
* 1 /usr/bin/x86_64-w64-mingw32-g++-posix 30 manual mode
58-
2 /usr/bin/x86_64-w64-mingw32-g++-win32 60 manual mode
59-
60-
Press <enter> to keep the current choice[*], or type selection number:
61-
```
62-
6342
Once the toolchain is installed the build steps are common:
6443

6544
Note that for WSL the Dash Core source path MUST be somewhere in the default mount file system, for
@@ -100,13 +79,3 @@ way. This will install to `c:\workspace\dash`, for example:
10079
You can also create an installer using:
10180

10281
make deploy
103-
104-
Footnotes
105-
---------
106-
107-
<a name="footnote1">1</a>: Starting from Ubuntu Xenial 16.04, both the 32 and 64 bit Mingw-w64 packages install two different
108-
compiler options to allow a choice between either posix or win32 threads. The default option is win32 threads which is the more
109-
efficient since it will result in binary code that links directly with the Windows kernel32.lib. Unfortunately, the headers
110-
required to support win32 threads conflict with some of the classes in the C++11 standard library, in particular std::mutex.
111-
It's not possible to build the Dash Core code using the win32 version of the Mingw-w64 cross compilers (at least not without
112-
modifying headers in the Dash Core source code).

0 commit comments

Comments
 (0)