diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-06-24 16:52:59 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-06-24 16:54:24 +0200 |
| commit | 66e1a08d6fbf39b5971add2aa221d3c39805c01e (patch) | |
| tree | effcf73d061ac4e4b908026c8f6dec703786e8d9 | |
| parent | 03f3925bac961cddfa6ab6859bc45b3616716312 (diff) | |
| parent | 471a4992d4a4477d7e234a82d3639d06f4572e9a (diff) | |
Merge #13486: build: Move rpc/util.cpp from libbitcoin-util to libbitcoin-server
471a4992d4a4477d7e234a82d3639d06f4572e9a Move rpc/util.cpp from libbitcoin-util to libbitcoin-server (Chun Kuan Lee)
Pull request description:
The functions in `rpc/util.cpp` would call functions in `script/standard.cpp` which in libbitcoin-common. This could cause problem if the linker does not strip out unused function while linking `bitcoin-cli`.
Tree-SHA512: 2f8335c880eeb00a29a359d5398a93d9f2909094b8febf2ad0a1e01388d077634fb5e72a638671bae8de89e1936c234d3f47ff445f1e456de723389bdc22d089
| -rw-r--r-- | src/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index e03c21f16e..a2599d33e1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -235,6 +235,7 @@ libbitcoin_server_a_SOURCES = \ rpc/net.cpp \ rpc/rawtransaction.cpp \ rpc/server.cpp \ + rpc/util.cpp \ script/sigcache.cpp \ timedata.cpp \ torcontrol.cpp \ @@ -392,7 +393,6 @@ libbitcoin_util_a_SOURCES = \ logging.cpp \ random.cpp \ rpc/protocol.cpp \ - rpc/util.cpp \ support/cleanse.cpp \ sync.cpp \ threadinterrupt.cpp \ |