Skip to content

Commit 9a427da

Browse files
committed
build: re-add AM_LDFLAGS where it's overridden
using _LDFLAGS replaces AM_LDFLAGS rather than adding to it.
1 parent 418d4ad commit 9a427da

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/Makefile.qt.include

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ qt_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL)
363363
if USE_LIBSECP256K1
364364
qt_bitcoin_qt_LDADD += secp256k1/libsecp256k1.la
365365
endif
366-
qt_bitcoin_qt_LDFLAGS = $(QT_LDFLAGS)
366+
qt_bitcoin_qt_LDFLAGS = $(AM_LDFLAGS) $(QT_LDFLAGS)
367367

368368
#locale/foo.ts -> locale/foo.qm
369369
QT_QM=$(QT_TS:.ts=.qm)

src/Makefile.qttest.include

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBIT
3636
if USE_LIBSECP256K1
3737
qt_test_test_bitcoin_qt_LDADD += secp256k1/libsecp256k1.la
3838
endif
39-
qt_test_test_bitcoin_qt_LDFLAGS = $(QT_LDFLAGS)
39+
qt_test_test_bitcoin_qt_LDFLAGS = $(AM_LDFLAGS) $(QT_LDFLAGS)
4040

4141
CLEAN_BITCOIN_QT_TEST = $(TEST_QT_MOC_CPP) qt/test/*.gcda qt/test/*.gcno
4242

0 commit comments

Comments
 (0)