mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-01-21 07:39:08 +01:00
Merge #19331: build: Do not include server symbols in wallet
faca73000fci: Install fixed version of clang-format for linters (MarcoFalke)fa4695da4cbuild: Sort Makefile.am after renaming file (MarcoFalke)cccc2784a3scripted-diff: Move ui_interface to the node lib (MarcoFalke)fa72ca6a9dqt: Remove unused includes (MarcoFalke)fac96e6450wallet: Do not include server symbols (MarcoFalke)fa0f6c58c1Revert "Fix link error with --enable-debug" (MarcoFalke) Pull request description: This reverts a hacky workaround from commitb83cc0f, which only happens to work due to compiler optimizations. Then, it actually fixes the linker error. The underlying problem is that the wallet includes symbols from the server (ui_interface), which usually results in linker failures. Though, in this specific case the linker failures have not been observed (unless `-O0`) because our compilers were smart enough to strip unused symbols. Fix the underlying problem by creating a new header-only with the needed symbol and move ui_interface to node to clarify that this is part of libbitcoin_server. ACKs for top commit: Sjors: ACKfaca730laanwj: ACKfaca73000fhebasto: re-ACKfaca73000f, since the [previous](https://github.com/bitcoin/bitcoin/pull/19331#pullrequestreview-434420539) review: Tree-SHA512: e9731f249425aaea50b6db5fc7622e10078cf006721bb87989cac190a2ff224412f6f8a7dd83efd018835302337611f5839e29e15bef366047ed591cef58dfb4
This commit is contained in:
@@ -20,6 +20,7 @@
|
||||
#include <index/txindex.h>
|
||||
#include <logging.h>
|
||||
#include <logging/timer.h>
|
||||
#include <node/ui_interface.h>
|
||||
#include <optional.h>
|
||||
#include <policy/fees.h>
|
||||
#include <policy/policy.h>
|
||||
@@ -36,7 +37,6 @@
|
||||
#include <tinyformat.h>
|
||||
#include <txdb.h>
|
||||
#include <txmempool.h>
|
||||
#include <ui_interface.h>
|
||||
#include <uint256.h>
|
||||
#include <undo.h>
|
||||
#include <util/moneystr.h>
|
||||
|
||||
Reference in New Issue
Block a user