Skip to content

Commit b73deae

Browse files
kwvgkwvg
committed
build: s/BACKTRACE_LIB/BACKTRACE_LIBS/g
Backtrace capabilities require multiple libraries depending on the platform, let's keep the name more descriptive
1 parent e41899e commit b73deae

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

‎src/Makefile.am‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ endif
4141
endif
4242

4343
if TARGET_WINDOWS
44-
BACKTRACE_LIB = -ldbghelp -lbacktrace
44+
BACKTRACE_LIBS = -ldbghelp -lbacktrace
4545
else
46-
BACKTRACE_LIB = -lbacktrace
46+
BACKTRACE_LIBS = -lbacktrace
4747
endif
4848
endif #ENABLE_STACKTRACES
4949

@@ -1028,7 +1028,7 @@ bitcoin_bin_ldadd = \
10281028
$(LIBMEMENV) \
10291029
$(LIBSECP256K1)
10301030

1031-
bitcoin_bin_ldadd += $(BACKTRACE_LIB) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(SQLITE_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS) $(GMP_LIBS)
1031+
bitcoin_bin_ldadd += $(BACKTRACE_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(SQLITE_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS) $(GMP_LIBS)
10321032

10331033
dashd_SOURCES = $(bitcoin_daemon_sources) init/bitcoind.cpp
10341034
dashd_CPPFLAGS = $(bitcoin_bin_cppflags)
@@ -1057,7 +1057,7 @@ dash_cli_LDADD = \
10571057
$(LIBUNIVALUE) \
10581058
$(LIBBITCOIN_UTIL) \
10591059
$(LIBBITCOIN_CRYPTO)
1060-
dash_cli_LDADD += $(BACKTRACE_LIB) $(EVENT_LIBS) $(GMP_LIBS)
1060+
dash_cli_LDADD += $(BACKTRACE_LIBS) $(EVENT_LIBS) $(GMP_LIBS)
10611061
#
10621062

10631063
# dash-tx binary #
@@ -1079,7 +1079,7 @@ dash_tx_LDADD = \
10791079
$(LIBDASHBLS) \
10801080
$(LIBSECP256K1)
10811081

1082-
dash_tx_LDADD += $(BACKTRACE_LIB) $(GMP_LIBS)
1082+
dash_tx_LDADD += $(BACKTRACE_LIBS) $(GMP_LIBS)
10831083
#
10841084

10851085
# dash-wallet binary #
@@ -1097,7 +1097,7 @@ dash_wallet_LDADD = \
10971097
$(LIBBITCOIN_CRYPTO) \
10981098
$(LIBDASHBLS) \
10991099
$(LIBSECP256K1) \
1100-
$(BACKTRACE_LIB) \
1100+
$(BACKTRACE_LIBS) \
11011101
$(BOOST_LIBS) \
11021102
$(BDB_LIBS) \
11031103
$(SQLITE_LIBS) \

‎src/Makefile.bench.include‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ bench_bench_dash_LDADD = \
8181
$(MINIUPNPC_LIBS) \
8282
$(NATPMP_LIBS) \
8383
$(GMP_LIBS) \
84-
$(BACKTRACE_LIB)
84+
$(BACKTRACE_LIBS)
8585

8686
if ENABLE_ZMQ
8787
bench_bench_dash_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)

‎src/Makefile.qt.include‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ if ENABLE_ZMQ
417417
bitcoin_qt_ldadd += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
418418
endif
419419
bitcoin_qt_ldadd += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBDASHBLS) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
420-
$(BACKTRACE_LIB) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(SQLITE_LIBS) $(LIBSECP256K1) \
420+
$(BACKTRACE_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(SQLITE_LIBS) $(LIBSECP256K1) \
421421
$(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(GMP_LIBS)
422422
bitcoin_qt_ldflags = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS)
423423
bitcoin_qt_libtoolflags = $(AM_LIBTOOLFLAGS) --tag CXX

‎src/Makefile.qttest.include‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ if ENABLE_ZMQ
5959
qt_test_test_dash_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
6060
endif
6161
qt_test_test_dash_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBDASHBLS) $(LIBUNIVALUE) $(LIBLEVELDB) \
62-
$(LIBMEMENV) $(BACKTRACE_LIB) $(QT_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) \
62+
$(LIBMEMENV) $(BACKTRACE_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) \
6363
$(QR_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(SQLITE_LIBS) $(LIBSECP256K1) \
6464
$(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(GMP_LIBS)
6565
qt_test_test_dash_qt_LDFLAGS = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS)

‎src/Makefile.test.include‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ FUZZ_SUITE_LD_COMMON = \
6060
$(EVENT_LIBS) \
6161
$(EVENT_PTHREADS_LIBS) \
6262
$(GMP_LIBS) \
63-
$(BACKTRACE_LIB)
63+
$(BACKTRACE_LIBS)
6464

6565
if USE_UPNP
6666
FUZZ_SUITE_LD_COMMON += $(MINIUPNPC_LIBS)
@@ -256,7 +256,7 @@ test_test_dash_LDADD += $(LIBBITCOIN_WALLET)
256256
test_test_dash_CPPFLAGS += $(BDB_CPPFLAGS)
257257
endif
258258
test_test_dash_LDADD += $(LIBBITCOIN_NODE) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) \
259-
$(LIBDASHBLS) $(LIBLEVELDB) $(LIBMEMENV) $(BACKTRACE_LIB) $(LIBSECP256K1) $(EVENT_LIBS) $(EVENT_PTHREADS_LIBS) $(MINISKETCH_LIBS)
259+
$(LIBDASHBLS) $(LIBLEVELDB) $(LIBMEMENV) $(BACKTRACE_LIBS) $(LIBSECP256K1) $(EVENT_LIBS) $(EVENT_PTHREADS_LIBS) $(MINISKETCH_LIBS)
260260
test_test_dash_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
261261

262262
test_test_dash_LDADD += $(BDB_LIBS) $(MINIUPNPC_LIBS) $(SQLITE_LIBS) $(NATPMP_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(GMP_LIBS)

0 commit comments

Comments
 (0)