diff options
| author | fanquake <fanquake@gmail.com> | 2022-09-14 08:59:05 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-09-14 08:59:56 +0100 |
| commit | 13fd9ee5c2d747e9f74d3fd8e33a4f0c9eaa769c (patch) | |
| tree | e08dc02119add2920b6061234ec852cd02575d1d /src/Makefile.bench.include | |
| parent | 29d540b7ada890dd588c4825d40c27c5e6f20061 (diff) | |
| parent | 12de8f6262e9e74eb3c1a1c46070f7bc6a4cdac6 (diff) | |
| download | bitcoin-13fd9ee5c2d747e9f74d3fd8e33a4f0c9eaa769c.tar.xz | |
Merge bitcoin/bitcoin#26056: build: extract $(BOOST_CPPFLAGS) from $(BITCOIN_INCLUDES)
12de8f6262e9e74eb3c1a1c46070f7bc6a4cdac6 build: extract $(BOOST_CPPFLAGS) from $(BITCOIN_INCLUDES) (fanquake)
Pull request description:
This leaves `$(BITCOIN_INCLUDES)` as internal dependencies, and gives finer control over Boost includes.
Fixes #25947.
ACKs for top commit:
theuni:
ACK 12de8f6262e9e74eb3c1a1c46070f7bc6a4cdac6
hebasto:
ACK 12de8f6262e9e74eb3c1a1c46070f7bc6a4cdac6, tested on macOS Monterey 12.6 (21G115, Intel).
jarolrod:
ACK 12de8f6262e9e74eb3c1a1c46070f7bc6a4cdac6
Tree-SHA512: 550897c8168c82d6b79f51d5b9bbfa46ecc5e6deb514732762d0cf894de58787fda0ddf259675b4d224d7bd1a2bdcf2102d3c84f8b6ed73fc4b2357ab5687131
Diffstat (limited to 'src/Makefile.bench.include')
| -rw-r--r-- | src/Makefile.bench.include | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include index a23d872250..3ed643d932 100644 --- a/src/Makefile.bench.include +++ b/src/Makefile.bench.include @@ -51,7 +51,7 @@ bench_bench_bitcoin_SOURCES = \ nodist_bench_bench_bitcoin_SOURCES = $(GENERATED_BENCH_FILES) -bench_bench_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/ +bench_bench_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/ bench_bench_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) bench_bench_bitcoin_LDADD = \ $(LIBTEST_UTIL) \ |