From 1392e8e2d8cfe4115f0a152aca16ffe3f0f4573a Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Thu, 10 Mar 2022 15:38:34 -0500 Subject: 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 --- src/Makefile.bench.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Makefile.bench.include') diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include index 5dae4374e3..80773e2764 100644 --- a/src/Makefile.bench.include +++ b/src/Makefile.bench.include @@ -52,13 +52,13 @@ nodist_bench_bench_bitcoin_SOURCES = $(GENERATED_BENCH_FILES) bench_bench_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/ bench_bench_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) bench_bench_bitcoin_LDADD = \ + $(LIBTEST_UTIL) \ $(LIBBITCOIN_NODE) \ $(LIBBITCOIN_WALLET) \ $(LIBBITCOIN_COMMON) \ $(LIBBITCOIN_UTIL) \ $(LIBBITCOIN_CONSENSUS) \ $(LIBBITCOIN_CRYPTO) \ - $(LIBTEST_UTIL) \ $(LIBLEVELDB) \ $(LIBLEVELDB_SSE42) \ $(LIBMEMENV) \ -- cgit v1.2.3 From 64caf944797bc35c3044fe5675389656f9511a41 Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Tue, 15 Mar 2022 21:52:29 -0400 Subject: build: Remove vestigial LIBLEVELDB_SSE42 - LIBLEVELDB_SSE42_INT was defined, but never referenced anywhere - LIBLEVELDB_SSE42 is referenced, but never defined anywhere Apparently leveldb used to have platform-specific crc32 code before it got split off into a separate lib. --- src/Makefile.bench.include | 1 - 1 file changed, 1 deletion(-) (limited to 'src/Makefile.bench.include') diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include index 80773e2764..6fa9a4efa9 100644 --- a/src/Makefile.bench.include +++ b/src/Makefile.bench.include @@ -60,7 +60,6 @@ bench_bench_bitcoin_LDADD = \ $(LIBBITCOIN_CONSENSUS) \ $(LIBBITCOIN_CRYPTO) \ $(LIBLEVELDB) \ - $(LIBLEVELDB_SSE42) \ $(LIBMEMENV) \ $(LIBSECP256K1) \ $(LIBUNIVALUE) \ -- cgit v1.2.3