Skip to content

Commit 130490a

Browse files
committed
build: always build bitcoin-chainstate against static libbitcoinkernel
Building binaries against our uninstalled shared libs is impractical. Instead, to test them, we'll need to work on a runtime shared-lib execution harness.
1 parent 545a74e commit 130490a

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

src/Makefile.am

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -855,10 +855,7 @@ bitcoin_chainstate_SOURCES = bitcoin-chainstate.cpp
855855
bitcoin_chainstate_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS)
856856
bitcoin_chainstate_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
857857

858-
# $(LIBTOOL_APP_LDFLAGS) deliberately omitted here so that we can test linking
859-
# bitcoin-chainstate against libbitcoinkernel as a shared or static library by
860-
# setting --{en,dis}able-shared.
861-
bitcoin_chainstate_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(PTHREAD_FLAGS)
858+
bitcoin_chainstate_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(PTHREAD_FLAGS) $(LIBTOOL_APP_LDFLAGS) -static
862859
bitcoin_chainstate_LDADD = $(LIBBITCOINKERNEL)
863860

864861
# libtool is unable to calculate this indirect dependency, presumably because it's a subproject.

0 commit comments

Comments
 (0)