Skip to content

Commit 3d892d8

Browse files
committed
Merge bitcoin/bitcoin#26086: build: remove BOOST_CPPFLAGS usage from bitcoin-tx
f839697 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 f839697. hebasto: ACK f839697, tested on Linux x86_64 using theuni's [patch](theuni/bitcoin@e131d8f) with depends. Tree-SHA512: ec93f4045d927789d70e2a96a6869c0df63891483bb61361327bfefafaabc2925f63382aa3d9302963df2306bc035edad4cabd5eeb315db6603266e677be7cd3
2 parents 5a724d1 + f839697 commit 3d892d8

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

src/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ bitcoin_cli_LDADD += $(EVENT_LIBS)
772772

773773
# bitcoin-tx binary #
774774
bitcoin_tx_SOURCES = bitcoin-tx.cpp
775-
bitcoin_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS)
775+
bitcoin_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
776776
bitcoin_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
777777
bitcoin_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS)
778778

src/bitcoin-tx.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <key_io.h>
1616
#include <fs.h>
1717
#include <policy/policy.h>
18-
#include <policy/rbf.h>
1918
#include <primitives/transaction.h>
2019
#include <script/script.h>
2120
#include <script/sign.h>

0 commit comments

Comments
 (0)