Skip to content

Commit 928be77

Browse files
laanwjHariQuick
authored andcommitted
Merge bitcoin#13306: build: split warnings out of CXXFLAGS
9e305b5 build: split warnings out of CXXFLAGS (Cory Fields) Pull request description: CXXFLAGS should not be modified anyway. Also, this will enable us to selectively disable warnings. As discussed with @sipa on IRC. Intention is to be able to filter out warnings from leveldb code so that we can be more aggressive with what we enable. Tree-SHA512: 1bf686250f7a59c0aff04371f87c5db4e8f5bde604c6ab75e568326fb6d7733f26b113fa52dc1c836fa10baa76770d479a0e5f82a4a1905947dd7f245e0560f4
1 parent d0fefe7 commit 928be77

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

configure.ac

+7-5
Original file line numberDiff line numberDiff line change
@@ -377,11 +377,11 @@ if test "x$CXXFLAGS_overridden" = "xno"; then
377377
## Some compilers (gcc) ignore unknown -Wno-* options, but warn about all
378378
## unknown options if any other warning is produced. Test the -Wfoo case, and
379379
## set the -Wno-foo case if it works.
380-
AX_CHECK_COMPILE_FLAG([-Wunused-parameter],[CXXFLAGS="$CXXFLAGS -Wno-unused-parameter"],,[[$CXXFLAG_WERROR]])
381-
AX_CHECK_COMPILE_FLAG([-Wself-assign],[CXXFLAGS="$CXXFLAGS -Wno-self-assign"],,[[$CXXFLAG_WERROR]])
382-
AX_CHECK_COMPILE_FLAG([-Wunused-local-typedef],[CXXFLAGS="$CXXFLAGS -Wno-unused-local-typedef"],,[[$CXXFLAG_WERROR]])
383-
AX_CHECK_COMPILE_FLAG([-Wdeprecated-register],[CXXFLAGS="$CXXFLAGS -Wno-deprecated-register"],,[[$CXXFLAG_WERROR]])
384-
AX_CHECK_COMPILE_FLAG([-Wimplicit-fallthrough],[CXXFLAGS="$CXXFLAGS -Wno-implicit-fallthrough"],,[[$CXXFLAG_WERROR]])
380+
AX_CHECK_COMPILE_FLAG([-Wunused-parameter],[NOWARN_CXXFLAGS="$NOWARN_CXXFLAGS -Wno-unused-parameter"],,[[$CXXFLAG_WERROR]])
381+
AX_CHECK_COMPILE_FLAG([-Wself-assign],[NOWARN_CXXFLAGS="$NOWARN_CXXFLAGS -Wno-self-assign"],,[[$CXXFLAG_WERROR]])
382+
AX_CHECK_COMPILE_FLAG([-Wunused-local-typedef],[NOWARN_CXXFLAGS="$NOWARN_CXXFLAGS -Wno-unused-local-typedef"],,[[$CXXFLAG_WERROR]])
383+
AX_CHECK_COMPILE_FLAG([-Wdeprecated-register],[NOWARN_CXXFLAGS="$NOWARN_CXXFLAGS -Wno-deprecated-register"],,[[$CXXFLAG_WERROR]])
384+
AX_CHECK_COMPILE_FLAG([-Wimplicit-fallthrough],[NOWARN_CXXFLAGS="$NOWARN_CXXFLAGS -Wno-implicit-fallthrough"],,[[$CXXFLAG_WERROR]])
385385
fi
386386

387387
enable_hwcrc32=no
@@ -1459,6 +1459,8 @@ AC_SUBST(BITCOIN_TX_NAME)
14591459

14601460
AC_SUBST(RELDFLAGS)
14611461
AC_SUBST(DEBUG_CPPFLAGS)
1462+
AC_SUBST(WARN_CXXFLAGS)
1463+
AC_SUBST(NOWARN_CXXFLAGS)
14621464
AC_SUBST(DEBUG_CXXFLAGS)
14631465
AC_SUBST(ERROR_CXXFLAGS)
14641466
AC_SUBST(GPROF_CXXFLAGS)

src/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
DIST_SUBDIRS = secp256k1 univalue
77

88
AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) $(HARDENED_LDFLAGS) $(GPROF_LDFLAGS) $(SANITIZER_LDFLAGS)
9-
AM_CXXFLAGS = $(DEBUG_CXXFLAGS) $(HARDENED_CXXFLAGS) $(ERROR_CXXFLAGS) $(GPROF_CXXFLAGS) $(SANITIZER_CXXFLAGS)
9+
AM_CXXFLAGS = $(DEBUG_CXXFLAGS) $(HARDENED_CXXFLAGS) $(WARN_CXXFLAGS) $(NOWARN_CXXFLAGS) $(ERROR_CXXFLAGS) $(GPROF_CXXFLAGS) $(SANITIZER_CXXFLAGS)
1010
AM_CPPFLAGS = $(DEBUG_CPPFLAGS) $(HARDENED_CPPFLAGS)
1111
AM_LIBTOOLFLAGS = --preserve-dup-deps
1212
EXTRA_LIBRARIES =

0 commit comments

Comments
 (0)