Skip to content

Commit d696820

Browse files
committed
build: Correctly put boost at end of LDADD
This fixes linking issues when statically linking (thanks @imwuzhh).
1 parent 65515c0 commit d696820

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/Makefile.am

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@ nodist_libbitcoin_common_a_SOURCES = $(top_srcdir)/src/obj/build.h
9393
#
9494

9595
# bitcoind binary #
96-
bitcoind_LDADD = libbitcoin_server.a libbitcoin_cli.a libbitcoin_common.a leveldb/libleveldb.a leveldb/libmemenv.a \
97-
$(BOOST_LIBS)
96+
bitcoind_LDADD = libbitcoin_server.a libbitcoin_cli.a libbitcoin_common.a leveldb/libleveldb.a leveldb/libmemenv.a
9897
if ENABLE_WALLET
9998
bitcoind_LDADD += libbitcoin_wallet.a
10099
endif
@@ -106,7 +105,7 @@ bitcoind_SOURCES += bitcoind-res.rc
106105
endif
107106

108107
AM_CPPFLAGS += $(BDB_CPPFLAGS)
109-
bitcoind_LDADD += $(BDB_LIBS)
108+
bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS)
110109

111110
# bitcoin-cli binary #
112111
bitcoin_cli_LDADD = libbitcoin_cli.a libbitcoin_common.a $(BOOST_LIBS)

0 commit comments

Comments
 (0)