diff options
| author | fanquake <fanquake@gmail.com> | 2022-09-16 12:12:06 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-09-16 12:12:14 +0100 |
| commit | 3d892d8695850e8a45e0d8b831ef66cba5e0e375 (patch) | |
| tree | 463b393585c188bdd242e3a79898fb6ee3f4f870 /src | |
| parent | 5a724d1161ee1be0c2e516ea6263a8952d096279 (diff) | |
| parent | f839697d9b89002d020997154e182ddb4dccf45b (diff) | |
Merge bitcoin/bitcoin#26086: build: remove BOOST_CPPFLAGS usage from bitcoin-tx
f839697d9b89002d020997154e182ddb4dccf45b build: remove BOOST_CPPFLAGS usage from bitcoin-tx (fanquake)
Pull request description:
The only reason `BOOST_CPPFLAGS` was needed here, is because of the `policy/rbf.h` include, which ultimately includes boost multi_index via `txmempool.h`. However this include is unused.
ACKs for top commit:
theuni:
Nice. ACK f839697d9b89002d020997154e182ddb4dccf45b.
hebasto:
ACK f839697d9b89002d020997154e182ddb4dccf45b, tested on Linux x86_64 using theuni's [patch](https://github.com/theuni/bitcoin/commit/e131d8f1e33baa9a9499d2e1a4a99b171566c5a5) with depends.
Tree-SHA512: ec93f4045d927789d70e2a96a6869c0df63891483bb61361327bfefafaabc2925f63382aa3d9302963df2306bc035edad4cabd5eeb315db6603266e677be7cd3
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/bitcoin-tx.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index d5500b08a2..1bb887af20 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -772,7 +772,7 @@ bitcoin_cli_LDADD += $(EVENT_LIBS) # bitcoin-tx binary # bitcoin_tx_SOURCES = bitcoin-tx.cpp -bitcoin_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) +bitcoin_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) bitcoin_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) bitcoin_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS) diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp index c2bb89b8cf..d49dc72abf 100644 --- a/src/bitcoin-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -15,7 +15,6 @@ #include <key_io.h> #include <fs.h> #include <policy/policy.h> -#include <policy/rbf.h> #include <primitives/transaction.h> #include <script/script.h> #include <script/sign.h> |