diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-02-04 17:43:10 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-02-04 17:43:19 +0100 |
| commit | 152a8216cc7b170eed26ee4c3a65dbe592e55f05 (patch) | |
| tree | e996b24909e3448d86a77c39057972186b9d16ff /src/Makefile.bench.include | |
| parent | d2228384de3a870803697a6cc95467b97e9a37a5 (diff) | |
| parent | 42407ed43ad24ac1016eb457a7b0e720e63188cd (diff) | |
Merge #7349: Build against system UniValue when available
42407ed build-unix: Update UniValue build conditions (Luke Dashjr)
cdcad9f LDADD dependency order shuffling (Luke Dashjr)
62f7f2e Bugfix: Always include univalue in DIST_SUBDIRS (Luke Dashjr)
2356515 Change default configure option --with-system-univalue to "no" (Luke Dashjr)
5d3b29b doc: Add UniValue to build instructions (Luke Dashjr)
ab22705 Build against system UniValue when available (Luke Dashjr)
2adf7e2 Bugfix: The var is LIBUNIVALUE,not LIBBITCOIN_UNIVALUE (Luke Dashjr)
Diffstat (limited to 'src/Makefile.bench.include')
| -rw-r--r-- | src/Makefile.bench.include | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include index d3cecb6b43..8e7b59b461 100644 --- a/src/Makefile.bench.include +++ b/src/Makefile.bench.include @@ -14,13 +14,13 @@ bench_bench_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) bench_bench_bitcoin_LDADD = \ $(LIBBITCOIN_SERVER) \ $(LIBBITCOIN_COMMON) \ - $(LIBBITCOIN_UNIVALUE) \ $(LIBBITCOIN_UTIL) \ $(LIBBITCOIN_CONSENSUS) \ $(LIBBITCOIN_CRYPTO) \ $(LIBLEVELDB) \ $(LIBMEMENV) \ - $(LIBSECP256K1) + $(LIBSECP256K1) \ + $(LIBUNIVALUE) if ENABLE_ZMQ bench_bench_bitcoin_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) |