Skip to content

Commit 6a680a6

Browse files
author
MarcoFalke
committed
Merge #21226: build: Fix fuzz binary compilation under windows
56ace90 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 56ace90 the best bugfixes are the ones removing code Tree-SHA512: 6088fd955a5e511b5ca1b3eaa8469a889eb6d994c2827acac7695dac6e4e320a344b45f4015a2f279b16df0d4b23ec4df13304ae6315395ad2fe8c5b526cada4
2 parents f1c2f61 + 56ace90 commit 6a680a6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ci/test/00_setup_env_win64.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export DPKG_ADD_ARCH="i386"
1313
export PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64 wine32 file"
1414
export RUN_FUNCTIONAL_TESTS=false
1515
export GOAL="deploy"
16-
export BITCOIN_CONFIG="--enable-reduce-exports --disable-fuzz-binary --disable-gui-tests --without-boost-process"
16+
export BITCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests --without-boost-process"
1717

1818
# Compiler for MinGW-w64 causes false -Wreturn-type warning.
1919
# See https://sourceforge.net/p/mingw-w64/bugs/306/

src/test/fuzz/fuzz.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv)
7272
}
7373

7474
#if defined(PROVIDE_MAIN_FUNCTION)
75-
__attribute__((weak)) int main(int argc, char** argv)
75+
int main(int argc, char** argv)
7676
{
7777
initialize();
7878
static const auto& test_one_input = *Assert(g_test_one_input);

0 commit comments

Comments
 (0)