diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-02-19 11:30:37 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-02-19 11:30:41 +0100 |
| commit | 6a680a6236e07c93f28514fe05fbb64a29cb2ec8 (patch) | |
| tree | 40b72941ce52b1b11520eec46422313823a89387 /ci | |
| parent | f1c2f619a68733ad79658288cc9a3b866679bf08 (diff) | |
| parent | 56ace907b9b7b4544c95e2945dc07e217718a8e5 (diff) | |
| download | bitcoin-6a680a6236e07c93f28514fe05fbb64a29cb2ec8.tar.xz | |
Merge #21226: build: Fix fuzz binary compilation under windows
56ace907b9b7b4544c95e2945dc07e217718a8e5 Fix fuzz binary compilation under windows (Dan Benjamin)
Pull request description:
Small change to allow the fuzz binary to compile under windows. Also removed --disable-fuzz-binary from the windows CI test. This fixes #21212.
ACKs for top commit:
MarcoFalke:
review ACK 56ace907b9b7b4544c95e2945dc07e217718a8e5 the best bugfixes are the ones removing code
Tree-SHA512: 6088fd955a5e511b5ca1b3eaa8469a889eb6d994c2827acac7695dac6e4e320a344b45f4015a2f279b16df0d4b23ec4df13304ae6315395ad2fe8c5b526cada4
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/test/00_setup_env_win64.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/test/00_setup_env_win64.sh b/ci/test/00_setup_env_win64.sh index 3eea0a4565..1e68d2a61a 100644 --- a/ci/test/00_setup_env_win64.sh +++ b/ci/test/00_setup_env_win64.sh @@ -13,7 +13,7 @@ export DPKG_ADD_ARCH="i386" export PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64 wine32 file" export RUN_FUNCTIONAL_TESTS=false export GOAL="deploy" -export BITCOIN_CONFIG="--enable-reduce-exports --disable-fuzz-binary --disable-gui-tests --without-boost-process" +export BITCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests --without-boost-process" # Compiler for MinGW-w64 causes false -Wreturn-type warning. # See https://sourceforge.net/p/mingw-w64/bugs/306/ |