Skip to content

Commit

Permalink
Merge #13486: build: Move rpc/util.cpp from libbitcoin-util to libbit…
Browse files Browse the repository at this point in the history
…coin-server

471a499 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
  • Loading branch information
laanwj committed Jun 24, 2018
2 parents 03f3925 + 471a499 commit 66e1a08
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down

0 comments on commit 66e1a08

Please sign in to comment.