diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-01-13 11:47:26 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-01-13 11:47:50 +0100 |
| commit | f2f9fdf5794ebfc76603054c551f2dd02995a5bb (patch) | |
| tree | 0d35a89df5035d53eea5110ecad83972e3c617a7 | |
| parent | e258ce792a4849927a6db51786732d71cbbb65fc (diff) | |
| parent | 831e1220bc151b1016412359775406b34cb8f52c (diff) | |
| download | bitcoin-f2f9fdf5794ebfc76603054c551f2dd02995a5bb.tar.xz | |
Merge #17910: build: remove double LIBBITCOIN_SERVER linking
831e1220bc151b1016412359775406b34cb8f52c build: remove double LIBBITCOIN_SERVER linking (fanquake)
Pull request description:
Seems that this is no longer required. Have tested building on macOS and Debian.
ACKs for top commit:
promag:
ACK 831e1220bc151b1016412359775406b34cb8f52c.
practicalswift:
ACK 831e1220bc151b1016412359775406b34cb8f52c
laanwj:
ACK 831e1220bc151b1016412359775406b34cb8f52c
Tree-SHA512: d226d9fa0292189fae7e2af14781a511c3633f1352324f19ae642e941d06c34e2abf8b1df97d2330d76dba6024a93d8d341e02cc4882d7066f97e82585631fe1
| -rw-r--r-- | src/Makefile.am | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 5ae945ac69..3af54c65b2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -554,12 +554,9 @@ if TARGET_WINDOWS bitcoind_SOURCES += bitcoind-res.rc endif -# Libraries below may be listed more than once to resolve circular dependencies (see -# https://eli.thegreenplace.net/2013/07/09/library-order-in-static-linking#circular-dependency) bitcoind_LDADD = \ $(LIBBITCOIN_SERVER) \ $(LIBBITCOIN_WALLET) \ - $(LIBBITCOIN_SERVER) \ $(LIBBITCOIN_COMMON) \ $(LIBUNIVALUE) \ $(LIBBITCOIN_UTIL) \ |