diff options
| author | merge-script <fanquake@gmail.com> | 2024-10-11 13:46:40 +0100 |
|---|---|---|
| committer | merge-script <fanquake@gmail.com> | 2024-10-11 13:46:40 +0100 |
| commit | 48cf3da636089873ba7280e0d5b22eb81811d194 (patch) | |
| tree | 740ea73561e3322c0d2d3c2ecc3d32319df7b2e9 /src | |
| parent | d8b835cf18ce459f1179354d1695c34d9f2b03f0 (diff) | |
| parent | ccd10fdb97f9b8268a5cd60d7461967cfe536f16 (diff) | |
Merge bitcoin/bitcoin#30970: build: Add missing USDT header dependency to kernel
ccd10fdb97f9b8268a5cd60d7461967cfe536f16 build: Add missing USDT header dependency to kernel (Cory Fields)
Pull request description:
Noticed while testing a branch that replaces `boost::multi_index` with a custom replacement.
Currently depends builds pick up usdt and boost from the same path, and because boost always exists, the usdt path is implicitly included. So without boost, USDT isn't found.
An alternative to this would be to disable USDT for the kernel. I'd be open to either approach.
ACKs for top commit:
hebasto:
ACK ccd10fdb97f9b8268a5cd60d7461967cfe536f16, the diff looks correct.
fanquake:
ACK ccd10fdb97f9b8268a5cd60d7461967cfe536f16
Tree-SHA512: 2f91b8d5c8b169f7b72323d9163b5201f606ccdab95de7085847d2a672d10f940f69642c2528226a5efa4c589af24ca3bb9dd909eed0993e4cecd9689b4bed2f
Diffstat (limited to 'src')
| -rw-r--r-- | src/kernel/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt index 65d753b3af..7bf8efc516 100644 --- a/src/kernel/CMakeLists.txt +++ b/src/kernel/CMakeLists.txt @@ -84,6 +84,7 @@ target_link_libraries(bitcoinkernel bitcoin_crypto leveldb secp256k1 + $<TARGET_NAME_IF_EXISTS:USDT::headers> PUBLIC Boost::headers ) |