Skip to content

Commit e2ae6a2

Browse files
author
MarcoFalke
committed
Merge #20182: ci: Build with --enable-werror by default, and document exceptions
2f6fe4e ci: Build with --enable-werror by default, and document exceptions (Hennadii Stepanov) Pull request description: This PR prevents introducing of new compiler warnings in the master branch, e.g., #19986, #20162. ACKs for top commit: practicalswift: cr ACK 2f6fe4e: patch looks correct MarcoFalke: re-ACK 2f6fe4e 🏏 vasild: ACK 2f6fe4e Tree-SHA512: 23b5feb5bc472658c992d882ef61af23496f25adaa19f9c79bfaef5d2db273d44981aa93b1631a7d37cb58755283c1dacf3f2d68e501522d3fa8c965ab646d19
2 parents a0489f3 + 2f6fe4e commit e2ae6a2

File tree

5 files changed

+11
-4
lines changed

5 files changed

+11
-4
lines changed

ci/test/00_setup_env_arm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ export RUN_FUNCTIONAL_TESTS=false
2525
export GOAL="install"
2626
# -Wno-psabi is to disable ABI warnings: "note: parameter passing for argument of type ... changed in GCC 7.1"
2727
# This could be removed once the ABI change warning does not show up by default
28-
export BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports CXXFLAGS=-Wno-psabi --enable-werror --with-boost-process"
28+
export BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports CXXFLAGS=-Wno-psabi --with-boost-process"

ci/test/00_setup_env_mac.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ export XCODE_BUILD_ID=11C505
1515
export RUN_UNIT_TESTS=false
1616
export RUN_FUNCTIONAL_TESTS=false
1717
export GOAL="deploy"
18-
export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --enable-werror --with-boost-process"
18+
export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --with-boost-process"

ci/test/00_setup_env_mac_host.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8
99
export HOST=x86_64-apple-darwin18
1010
export PIP_PACKAGES="zmq"
1111
export GOAL="install"
12-
export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --enable-werror --with-boost-process"
12+
export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --with-boost-process"
1313
export CI_OS_NAME="macos"
1414
export NO_DEPENDS=1
1515
export OSX_SDK=""

ci/test/00_setup_env_win64.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,7 @@ export RUN_FUNCTIONAL_TESTS=false
1414
export RUN_SECURITY_TESTS="true"
1515
export GOAL="deploy"
1616
export BITCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests --without-boost-process"
17+
18+
# Compiler for MinGW-w64 causes false -Wreturn-type warning.
19+
# See https://sourceforge.net/p/mingw-w64/bugs/306/
20+
export NO_WERROR=1

ci/test/06_script_a.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66

77
export LC_ALL=C.UTF-8
88

9-
BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$DEPENDS_DIR/$HOST --bindir=$BASE_OUTDIR/bin --libdir=$BASE_OUTDIR/lib"
9+
BITCOIN_CONFIG_ALL="--enable-suppress-external-warnings --disable-dependency-tracking --prefix=$DEPENDS_DIR/$HOST --bindir=$BASE_OUTDIR/bin --libdir=$BASE_OUTDIR/lib"
10+
if [ -z "$NO_WERROR" ]; then
11+
BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} --enable-werror"
12+
fi
1013
DOCKER_EXEC "ccache --zero-stats --max-size=$CCACHE_SIZE"
1114

1215
BEGIN_FOLD autogen

0 commit comments

Comments
 (0)