diff options
author | fanquake <fanquake@gmail.com> | 2020-03-26 17:09:01 +0800 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2020-03-26 17:20:28 +0800 |
commit | e99ca783cd2d064734dfe7920bcfa438355b5aab (patch) | |
tree | 0f3552c8a1165411e217c8531ba721f85cf61ea7 | |
parent | d8ce27ff9f806efaf95cb4aeb11b9d5a3f106e88 (diff) | |
parent | 1f97b69ba27deb645bf5dd229d0cb97d2baf8f49 (diff) | |
download | bitcoin-e99ca783cd2d064734dfe7920bcfa438355b5aab.tar.xz |
Merge #18429: build: remove double LIBBITCOIN_SERVER from bench-Makefile
1f97b69ba27deb645bf5dd229d0cb97d2baf8f49 build: remove double LIBBITCOIN_SERVER from bench-Makefile (Harris)
Pull request description:
This PR removes the redundant **LIBBITCOIN_SERVER** linking from bench's Makefile.
This PR is similar to https://github.com/bitcoin/bitcoin/pull/17910
Originally, this PR was part of https://github.com/bitcoin/bitcoin/pull/18377, which later got replaced by a better one https://github.com/bitcoin/bitcoin/pull/18397 written by **hebasto**.
ACKs for top commit:
Empact:
Code Review ACK https://github.com/bitcoin/bitcoin/pull/18429/commits/1f97b69ba27deb645bf5dd229d0cb97d2baf8f49
theStack:
ACK https://github.com/bitcoin/bitcoin/pull/18429/commits/1f97b69ba27deb645bf5dd229d0cb97d2baf8f49
hebasto:
ACK 1f97b69ba27deb645bf5dd229d0cb97d2baf8f49
Tree-SHA512: e43035262361d4458a7dcfc920445540f19301387814cde1be0539c936fc20da0dcbe49e5ea25385e6d36d9639515b7a4171228223da568d93427e9c32810945
-rw-r--r-- | src/Makefile.bench.include | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include index b8fa048161..eae8b1fcd1 100644 --- a/src/Makefile.bench.include +++ b/src/Makefile.bench.include @@ -48,7 +48,6 @@ bench_bench_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) bench_bench_bitcoin_LDADD = \ $(LIBBITCOIN_SERVER) \ $(LIBBITCOIN_WALLET) \ - $(LIBBITCOIN_SERVER) \ $(LIBBITCOIN_COMMON) \ $(LIBBITCOIN_UTIL) \ $(LIBBITCOIN_CONSENSUS) \ |