Skip to content

Commit 1392e8e

Browse files
committed
build: Don't add unrelated libs to LIBTEST_*
This was used to, in effect, manually emulate --start-group/--end-group. However, we can just order the libraries correctly and avoid specifying libraries multiple times on the link line. Note: lld (not ld.bfd) knows how to resolve out-of-order references and doesn't seem to need the reodering
1 parent 2b5a741 commit 1392e8e

File tree

3 files changed

+1
-11
lines changed

3 files changed

+1
-11
lines changed

src/Makefile.bench.include

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ nodist_bench_bench_bitcoin_SOURCES = $(GENERATED_BENCH_FILES)
5252
bench_bench_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/
5353
bench_bench_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
5454
bench_bench_bitcoin_LDADD = \
55+
$(LIBTEST_UTIL) \
5556
$(LIBBITCOIN_NODE) \
5657
$(LIBBITCOIN_WALLET) \
5758
$(LIBBITCOIN_COMMON) \
5859
$(LIBBITCOIN_UTIL) \
5960
$(LIBBITCOIN_CONSENSUS) \
6061
$(LIBBITCOIN_CRYPTO) \
61-
$(LIBTEST_UTIL) \
6262
$(LIBLEVELDB) \
6363
$(LIBLEVELDB_SSE42) \
6464
$(LIBMEMENV) \

src/Makefile.test_fuzz.include

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,3 @@ libtest_fuzz_a_SOURCES = \
1818
test/fuzz/fuzz.cpp \
1919
test/fuzz/util.cpp \
2020
$(TEST_FUZZ_H)
21-
22-
LIBTEST_FUZZ += $(LIBBITCOIN_NODE)
23-
LIBTEST_FUZZ += $(LIBBITCOIN_COMMON)
24-
LIBTEST_FUZZ += $(LIBBITCOIN_UTIL)
25-
LIBTEST_FUZZ += $(LIBBITCOIN_CRYPTO_BASE)

src/Makefile.test_util.include

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,3 @@ libtest_util_a_SOURCES = \
3434
test/util/validation.cpp \
3535
test/util/wallet.cpp \
3636
$(TEST_UTIL_H)
37-
38-
LIBTEST_UTIL += $(LIBBITCOIN_NODE)
39-
LIBTEST_UTIL += $(LIBBITCOIN_COMMON)
40-
LIBTEST_UTIL += $(LIBBITCOIN_UTIL)
41-
LIBTEST_UTIL += $(LIBBITCOIN_CRYPTO_BASE)

0 commit comments

Comments
 (0)