Skip to content

Commit 80d1598

Browse files
committed
Merge bitcoin/bitcoin#26099: build: remove duplicate / unneeded libs from bench_bitcoin
ff7c81f build: remove duplicate / unneeded libs from bench_bitcoin (fanquake) Pull request description: EVENT_*_LIBS are already in LDADD. Move wallet libs into the wallet conditional, similar to zmq. ACKs for top commit: theuni: ACK ff7c81f Tree-SHA512: 6bd92f03478d56cd38645e38c0e6c4614cdf9c745124069d0d1d80483d76f5c656e1749061455ba04c619684513a063dda3f8f4bd09fe7b66911714d83592f25
2 parents b1f44ec + ff7c81f commit 80d1598

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/Makefile.bench.include

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ nodist_bench_bench_bitcoin_SOURCES = $(GENERATED_BENCH_FILES)
5353

5454
bench_bench_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/
5555
bench_bench_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
56+
bench_bench_bitcoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS)
5657
bench_bench_bitcoin_LDADD = \
5758
$(LIBTEST_UTIL) \
5859
$(LIBBITCOIN_NODE) \
@@ -66,7 +67,9 @@ bench_bench_bitcoin_LDADD = \
6667
$(LIBSECP256K1) \
6768
$(LIBUNIVALUE) \
6869
$(EVENT_PTHREADS_LIBS) \
69-
$(EVENT_LIBS)
70+
$(EVENT_LIBS) \
71+
$(MINIUPNPC_LIBS) \
72+
$(NATPMP_LIBS)
7073

7174
if ENABLE_ZMQ
7275
bench_bench_bitcoin_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
@@ -76,11 +79,9 @@ if ENABLE_WALLET
7679
bench_bench_bitcoin_SOURCES += bench/coin_selection.cpp
7780
bench_bench_bitcoin_SOURCES += bench/wallet_balance.cpp
7881
bench_bench_bitcoin_SOURCES += bench/wallet_loading.cpp
82+
bench_bench_bitcoin_LDADD += $(BDB_LIBS) $(SQLITE_LIBS)
7983
endif
8084

81-
bench_bench_bitcoin_LDADD += $(BDB_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(SQLITE_LIBS)
82-
bench_bench_bitcoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS)
83-
8485
CLEAN_BITCOIN_BENCH = bench/*.gcda bench/*.gcno $(GENERATED_BENCH_FILES)
8586

8687
CLEANFILES += $(CLEAN_BITCOIN_BENCH)

0 commit comments

Comments
 (0)