diff options
author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2021-06-27 10:17:27 +0300 |
---|---|---|
committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2021-07-01 12:16:47 +0300 |
commit | 67669ab425b52a2b6be3d2f3b3b7e3939b676a2c (patch) | |
tree | 6d30fbe62086323a917059fe45fff59bfc4ba9b2 /src | |
parent | 333ec8be821162fccab8278b03b0da1f19a01925 (diff) | |
download | bitcoin-67669ab425b52a2b6be3d2f3b3b7e3939b676a2c.tar.xz |
build: Fix Boost Process compatibility with mingw-w64 compiler
Boost 1.71 has a broken compatibility with mingw-w64 compiler due to the
added __kernel_entry SAL annotations.
Diffstat (limited to 'src')
-rw-r--r-- | src/test/system_tests.cpp | 5 | ||||
-rw-r--r-- | src/util/system.cpp | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/test/system_tests.cpp b/src/test/system_tests.cpp index 940145b84f..e97eab2c00 100644 --- a/src/test/system_tests.cpp +++ b/src/test/system_tests.cpp @@ -7,6 +7,11 @@ #include <univalue.h> #ifdef ENABLE_EXTERNAL_SIGNER +#if defined(WIN32) && !defined(__kernel_entry) +// A workaround for boost 1.71 incompatibility with mingw-w64 compiler. +// For details see https://github.com/bitcoin/bitcoin/pull/22348. +#define __kernel_entry +#endif #include <boost/process.hpp> #endif // ENABLE_EXTERNAL_SIGNER diff --git a/src/util/system.cpp b/src/util/system.cpp index ee7a76be29..258ba2f235 100644 --- a/src/util/system.cpp +++ b/src/util/system.cpp @@ -6,6 +6,11 @@ #include <util/system.h> #ifdef ENABLE_EXTERNAL_SIGNER +#if defined(WIN32) && !defined(__kernel_entry) +// A workaround for boost 1.71 incompatibility with mingw-w64 compiler. +// For details see https://github.com/bitcoin/bitcoin/pull/22348. +#define __kernel_entry +#endif #include <boost/process.hpp> #endif // ENABLE_EXTERNAL_SIGNER |