diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-01-07 09:09:31 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-01-07 09:12:56 +0100 |
| commit | d696820b45d9b6be1c21a65f2c8ed3b260938cb7 (patch) | |
| tree | 3602f6d9377dc812798c4a2e8d52c42b66a03fb9 | |
| parent | 65515c0d05678334a52f686eaaa2bac1ff285a5a (diff) | |
| download | bitcoin-d696820b45d9b6be1c21a65f2c8ed3b260938cb7.tar.xz | |
build: Correctly put boost at end of LDADD
This fixes linking issues when statically linking
(thanks @imwuzhh).
| -rw-r--r-- | src/Makefile.am | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 5ce1c8e1b6..85d7c3c9c6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -93,8 +93,7 @@ nodist_libbitcoin_common_a_SOURCES = $(top_srcdir)/src/obj/build.h # # bitcoind binary # -bitcoind_LDADD = libbitcoin_server.a libbitcoin_cli.a libbitcoin_common.a leveldb/libleveldb.a leveldb/libmemenv.a \ - $(BOOST_LIBS) +bitcoind_LDADD = libbitcoin_server.a libbitcoin_cli.a libbitcoin_common.a leveldb/libleveldb.a leveldb/libmemenv.a if ENABLE_WALLET bitcoind_LDADD += libbitcoin_wallet.a endif @@ -106,7 +105,7 @@ bitcoind_SOURCES += bitcoind-res.rc endif AM_CPPFLAGS += $(BDB_CPPFLAGS) -bitcoind_LDADD += $(BDB_LIBS) +bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) # bitcoin-cli binary # bitcoin_cli_LDADD = libbitcoin_cli.a libbitcoin_common.a $(BOOST_LIBS) |