diff options
| author | fanquake <fanquake@gmail.com> | 2022-09-15 15:19:11 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-09-15 15:21:26 +0100 |
| commit | 20f03a5aedc2de39453d196c9b1ce2a537367bb9 (patch) | |
| tree | 61791f137f337d71ec7f0532e751e762f1ad01d6 | |
| parent | 718304d222671f98d2335cd9b90a3022f62d7b21 (diff) | |
| parent | 4b656b9ed35d502d39ca745047961f242a5d868d (diff) | |
Merge bitcoin/bitcoin#26089: build: remove unused cppflags
4b656b9ed35d502d39ca745047961f242a5d868d build: remove unused libevent cppflags (fanquake)
afce044bb6d99f01736013988f274863bebafce5 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 4b656b9ed35d502d39ca745047961f242a5d868d
hebasto:
ACK 4b656b9ed35d502d39ca745047961f242a5d868d, I have reviewed the code and it looks OK, I agree it can be merged.
Tree-SHA512: 800daeb06ddcbade3a862ca939a8cf87dc36282ed4fe9dc256d17b78a8751e2e08799788dc449046e1d875f93372912269d3ffcb5702628a41648794df32e887
| -rw-r--r-- | src/Makefile.test_fuzz.include | 2 | ||||
| -rw-r--r-- | src/Makefile.test_util.include | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.test_fuzz.include b/src/Makefile.test_fuzz.include index c5c4ae3aef..11b5c12062 100644 --- a/src/Makefile.test_fuzz.include +++ b/src/Makefile.test_fuzz.include @@ -13,7 +13,7 @@ TEST_FUZZ_H = \ test/fuzz/mempool_utils.h \ test/fuzz/util.h -libtest_fuzz_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) $(MINIUPNPC_CPPFLAGS) $(NATPMP_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) +libtest_fuzz_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) libtest_fuzz_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libtest_fuzz_a_SOURCES = \ test/fuzz/fuzz.cpp \ diff --git a/src/Makefile.test_util.include b/src/Makefile.test_util.include index 9e88128f65..ada789f1b0 100644 --- a/src/Makefile.test_util.include +++ b/src/Makefile.test_util.include @@ -20,7 +20,7 @@ TEST_UTIL_H = \ test/util/validation.h \ test/util/wallet.h -libtest_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) $(MINIUPNPC_CPPFLAGS) $(NATPMP_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) +libtest_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) libtest_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libtest_util_a_SOURCES = \ test/util/blockfilter.cpp \ |