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.test.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.test.include')
| -rw-r--r-- | src/Makefile.test.include | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 987f30251c..5f2e535e85 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -203,7 +203,7 @@ BITCOIN_TEST_SUITE += \ endif # ENABLE_WALLET test_test_bitcoin_SOURCES = $(BITCOIN_TEST_SUITE) $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES) -test_test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(TESTDEFS) $(EVENT_CFLAGS) +test_test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(TESTDEFS) $(BOOST_CPPFLAGS) $(EVENT_CFLAGS) test_test_bitcoin_LDADD = $(LIBTEST_UTIL) if ENABLE_WALLET test_test_bitcoin_LDADD += $(LIBBITCOIN_WALLET) @@ -223,7 +223,7 @@ FUZZ_SUITE_LD_COMMON += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) endif if ENABLE_FUZZ_BINARY -test_fuzz_fuzz_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +test_fuzz_fuzz_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) test_fuzz_fuzz_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_fuzz_LDADD = $(FUZZ_SUITE_LD_COMMON) test_fuzz_fuzz_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS) $(RUNTIME_LDFLAGS) |