Skip to content

Commit 2aab8a6

Browse files
committed
Merge bitcoin/bitcoin#21231: Add /opt/homebrew to path to look for boost libraries
9a09695 build: Add /opt/homebrew to path to look for boost libraries (Fu Yong Quah) Pull request description: Following the instruction in https://github.com/bitcoin/bitcoin/blob/master/doc/build-osx.md for building on the M1 Macs don't work out of the box, because homebrew now defaults to /opt/homebrew instead of /usr/local. This PR fixes that. ACKs for top commit: jonasschnelli: utACK 9a09695 promag: Tested ACK 9a09695. Tree-SHA512: 472568b97fbd8623481fe6fd43b0509fa32fe7f1c1d8090321a6a6a5bdc7343d4ad4122c10dcc7c9c93068db8a3f009a73befaf1ba11e4af54a66afd2c2dbe14
2 parents 1186910 + 9a09695 commit 2aab8a6

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

build-aux/m4/ax_boost_base.m4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# Test for the Boost C++ libraries of a particular version (or newer)
1212
#
1313
# If no path to the installed boost library is given the macro searchs
14-
# under /usr, /usr/local, /opt and /opt/local and evaluates the
14+
# under /usr, /usr/local, /opt, /opt/local and /opt/homebrew and evaluates the
1515
# $BOOST_ROOT environment variable. Further documentation is available at
1616
# <http://randspringer.de/boost/index.html>.
1717
#
@@ -151,7 +151,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
151151
else
152152
search_libsubdirs="$multiarch_libsubdir $libsubdirs"
153153
fi
154-
for _AX_BOOST_BASE_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
154+
for _AX_BOOST_BASE_boost_path_tmp in /usr /usr/local /opt /opt/local /opt/homebrew/; do
155155
if test -d "$_AX_BOOST_BASE_boost_path_tmp/include/boost" && test -r "$_AX_BOOST_BASE_boost_path_tmp/include/boost" ; then
156156
for libsubdir in $search_libsubdirs ; do
157157
if ls "$_AX_BOOST_BASE_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
@@ -227,7 +227,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
227227
fi
228228
else
229229
if test "x$cross_compiling" != "xyes" ; then
230-
for _AX_BOOST_BASE_boost_path in /usr /usr/local /opt /opt/local ; do
230+
for _AX_BOOST_BASE_boost_path in /usr /usr/local /opt /opt/local /opt/homebrew ; do
231231
if test -d "$_AX_BOOST_BASE_boost_path" && test -r "$_AX_BOOST_BASE_boost_path" ; then
232232
for i in `ls -d $_AX_BOOST_BASE_boost_path/include/boost-* 2>/dev/null`; do
233233
_version_tmp=`echo $i | sed "s#$_AX_BOOST_BASE_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`

0 commit comments

Comments
 (0)