Skip to content

Commit 20f03a5

Browse files
committed
Merge bitcoin/bitcoin#26089: build: remove unused cppflags
4b656b9 build: remove unused libevent cppflags (fanquake) afce044 build: remove unused natpmp / upnp cppflags (fanquake) Pull request description: Their inclusion is likely just the result of copy-paste. The only place upnp & natpmp CPPFLAGS should be used is [`libbitcoin_node` (mapport.cpp)](https://github.com/bitcoin/bitcoin/blob/13fd9ee5c2d747e9f74d3fd8e33a4f0c9eaa769c/src/Makefile.am#L352). ACKs for top commit: theuni: ACK 4b656b9 hebasto: ACK 4b656b9, I have reviewed the code and it looks OK, I agree it can be merged. Tree-SHA512: 800daeb06ddcbade3a862ca939a8cf87dc36282ed4fe9dc256d17b78a8751e2e08799788dc449046e1d875f93372912269d3ffcb5702628a41648794df32e887
2 parents 718304d + 4b656b9 commit 20f03a5

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/Makefile.test_fuzz.include

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ TEST_FUZZ_H = \
1313
test/fuzz/mempool_utils.h \
1414
test/fuzz/util.h
1515

16-
libtest_fuzz_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) $(MINIUPNPC_CPPFLAGS) $(NATPMP_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
16+
libtest_fuzz_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS)
1717
libtest_fuzz_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
1818
libtest_fuzz_a_SOURCES = \
1919
test/fuzz/fuzz.cpp \

src/Makefile.test_util.include

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ TEST_UTIL_H = \
2020
test/util/validation.h \
2121
test/util/wallet.h
2222

23-
libtest_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) $(MINIUPNPC_CPPFLAGS) $(NATPMP_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
23+
libtest_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS)
2424
libtest_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
2525
libtest_util_a_SOURCES = \
2626
test/util/blockfilter.cpp \

0 commit comments

Comments
 (0)