Skip to content

Commit b3c3d9a

Browse files
committed
Merge #18558: build: Fix boost detection for arch armv7l
da0842d build: Update ax_boost_mase.m4 to the latest serial (Hennadii Stepanov) Pull request description: Picked from the upstream autoconf-archive/autoconf-archive@90814f1 Fix #17010. This PR is [alternative](bitcoin/bitcoin#17010 (comment)) to #18501. ACKs for top commit: laanwj: ACK da0842d Tree-SHA512: 5e43e12c524e4ea6b967c9be02c81a75948eac6cf55b819e3339222a2e3414731581d40af3524ad865abae7c5247c190448ebf2aa5e0d9a338edb501cc23ba38
2 parents 1f70185 + da0842d commit b3c3d9a

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

build-aux/m4/ax_boost_base.m4

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
# and this notice are preserved. This file is offered as-is, without any
3434
# warranty.
3535

36-
#serial 47
36+
#serial 48
3737

3838
# example boost program (need to pass version)
3939
m4_define([_AX_BOOST_BASE_PROGRAM],
@@ -123,6 +123,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
123123
dnl are almost assuredly the ones desired.
124124
AS_CASE([${host_cpu}],
125125
[i?86],[multiarch_libsubdir="lib/i386-${host_os}"],
126+
[armv7l],[multiarch_libsubdir="lib/arm-${host_os}"],
126127
[multiarch_libsubdir="lib/${host_cpu}-${host_os}"]
127128
)
128129

0 commit comments

Comments
 (0)