Skip to content

Commit f661da7

Browse files
committed
Merge bitcoin/bitcoin#24521: build: Fix Boost.Process detection on macOS arm64
1d4157a build: Fix Boost.Process detection on macOS arm64 (Hennadii Stepanov) Pull request description: Could be tested as follows: ``` % brew install [email protected] % ./autogen.sh % ./configure --with-boost='/opt/homebrew/opt/[email protected]' ``` ACKs for top commit: promag: Tested ACK on 1d4157a with boost 1.76 on macOS arm64. #24523 is required for boost 1.78. Tree-SHA512: 7abd39a78e970ecc051e53b5923dfc31d3f0576cf4ff7fcfb9c8708c857c46a7a595ec36238def83f41158970eeee209980da4b8b70f0ff68f940a38ac9a0471
2 parents 93feabc + 1d4157a commit f661da7

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

configure.ac

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1446,13 +1446,16 @@ if test "$use_external_signer" != "no"; then
14461446
;;
14471447
*)
14481448
AC_MSG_CHECKING([whether Boost.Process can be used])
1449+
TEMP_CPPFLAGS="$CPPFLAGS"
1450+
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
14491451
TEMP_LDFLAGS="$LDFLAGS"
14501452
dnl Boost 1.73 and older require the following workaround.
14511453
LDFLAGS="$LDFLAGS $PTHREAD_CFLAGS"
14521454
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <boost/process.hpp>]])],
14531455
[have_boost_process="yes"],
14541456
[have_boost_process="no"])
14551457
LDFLAGS="$TEMP_LDFLAGS"
1458+
CPPFLAGS="$TEMP_CPPFLAGS"
14561459
AC_MSG_RESULT([$have_boost_process])
14571460
if test "$have_boost_process" = "yes"; then
14581461
use_external_signer="yes"

0 commit comments

Comments
 (0)