build: re-add AM_LDFLAGS where it's overridden
using _LDFLAGS replaces AM_LDFLAGS rather than adding to it.
This commit is contained in:
parent
418d4ad110
commit
9a427da116
2 changed files with 2 additions and 2 deletions
|
@ -363,7 +363,7 @@ qt_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL)
|
||||||
if USE_LIBSECP256K1
|
if USE_LIBSECP256K1
|
||||||
qt_bitcoin_qt_LDADD += secp256k1/libsecp256k1.la
|
qt_bitcoin_qt_LDADD += secp256k1/libsecp256k1.la
|
||||||
endif
|
endif
|
||||||
qt_bitcoin_qt_LDFLAGS = $(QT_LDFLAGS)
|
qt_bitcoin_qt_LDFLAGS = $(AM_LDFLAGS) $(QT_LDFLAGS)
|
||||||
|
|
||||||
#locale/foo.ts -> locale/foo.qm
|
#locale/foo.ts -> locale/foo.qm
|
||||||
QT_QM=$(QT_TS:.ts=.qm)
|
QT_QM=$(QT_TS:.ts=.qm)
|
||||||
|
|
|
@ -36,7 +36,7 @@ qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBIT
|
||||||
if USE_LIBSECP256K1
|
if USE_LIBSECP256K1
|
||||||
qt_test_test_bitcoin_qt_LDADD += secp256k1/libsecp256k1.la
|
qt_test_test_bitcoin_qt_LDADD += secp256k1/libsecp256k1.la
|
||||||
endif
|
endif
|
||||||
qt_test_test_bitcoin_qt_LDFLAGS = $(QT_LDFLAGS)
|
qt_test_test_bitcoin_qt_LDFLAGS = $(AM_LDFLAGS) $(QT_LDFLAGS)
|
||||||
|
|
||||||
CLEAN_BITCOIN_QT_TEST = $(TEST_QT_MOC_CPP) qt/test/*.gcda qt/test/*.gcno
|
CLEAN_BITCOIN_QT_TEST = $(TEST_QT_MOC_CPP) qt/test/*.gcda qt/test/*.gcno
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue