Skip to content

Commit

Permalink
build: Correctly put boost at end of LDADD
Browse files Browse the repository at this point in the history
This fixes linking issues when statically linking
(thanks @imwuzhh).
  • Loading branch information
laanwj committed Jan 7, 2014
1 parent 65515c0 commit d696820
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/Makefile.am
Expand Up @@ -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
Expand All @@ -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)
Expand Down

1 comment on commit d696820

@imwuzhh
Copy link
Contributor

@imwuzhh imwuzhh commented on d696820 Jan 7, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank @laanwj for your confirmation.

Please sign in to comment.