From 3b589cb2e457222404ec6ab6888fa2446d055852 Mon Sep 17 00:00:00 2001 From: Kittywhiskers Van Gogh <63189531+kittywhiskers@users.noreply.github.com> Date: Wed, 23 Aug 2023 15:13:50 +0530 Subject: [PATCH] merge bitcoin#21226: Fix fuzz binary compilation under windows --- ci/test/00_setup_env_win64.sh | 2 +- src/test/fuzz/fuzz.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/test/00_setup_env_win64.sh b/ci/test/00_setup_env_win64.sh index 03ff049ddf..b19876bece 100755 --- a/ci/test/00_setup_env_win64.sh +++ b/ci/test/00_setup_env_win64.sh @@ -13,5 +13,5 @@ export DPKG_ADD_ARCH="i386" export RUN_INTEGRATION_TESTS=false export RUN_SECURITY_TESTS="false" export GOAL="deploy" -export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --disable-fuzz-binary --disable-miner" +export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --disable-miner" export DIRECT_WINE_EXEC_TESTS=true diff --git a/src/test/fuzz/fuzz.cpp b/src/test/fuzz/fuzz.cpp index 9ef8b59676..9c8a5a05fb 100644 --- a/src/test/fuzz/fuzz.cpp +++ b/src/test/fuzz/fuzz.cpp @@ -72,7 +72,7 @@ extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv) } #if defined(PROVIDE_MAIN_FUNCTION) -__attribute__((weak)) int main(int argc, char** argv) +int main(int argc, char** argv) { initialize(); static const auto& test_one_input = *Assert(g_test_one_input);