diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-04-08 16:27:18 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-04-08 16:28:50 +0200 |
| commit | b3c3d9a518f8cc51c0b73c5e4ee6bd567be441d2 (patch) | |
| tree | d717d2fb2c81e2110645ce66c7f9008f077c2dba | |
| parent | 1f70185a809362117a8158e386fdead85728794f (diff) | |
| parent | da0842dcd44f8c9c9b167917fac0949b4978c3b0 (diff) | |
| download | bitcoin-b3c3d9a518f8cc51c0b73c5e4ee6bd567be441d2.tar.xz | |
Merge #18558: build: Fix boost detection for arch armv7l
da0842dcd44f8c9c9b167917fac0949b4978c3b0 build: Update ax_boost_mase.m4 to the latest serial (Hennadii Stepanov)
Pull request description:
Picked from the upstream https://github.com/autoconf-archive/autoconf-archive/commit/90814f1895435ee3aa077e0880bd6aa49bf14ec3
Fix #17010.
This PR is [alternative](https://github.com/bitcoin/bitcoin/issues/17010#issuecomment-610651736) to #18501.
ACKs for top commit:
laanwj:
ACK da0842dcd44f8c9c9b167917fac0949b4978c3b0
Tree-SHA512: 5e43e12c524e4ea6b967c9be02c81a75948eac6cf55b819e3339222a2e3414731581d40af3524ad865abae7c5247c190448ebf2aa5e0d9a338edb501cc23ba38
| -rw-r--r-- | build-aux/m4/ax_boost_base.m4 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build-aux/m4/ax_boost_base.m4 b/build-aux/m4/ax_boost_base.m4 index 16fa69b41f..2ae33f7140 100644 --- a/build-aux/m4/ax_boost_base.m4 +++ b/build-aux/m4/ax_boost_base.m4 @@ -33,7 +33,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 47 +#serial 48 # example boost program (need to pass version) m4_define([_AX_BOOST_BASE_PROGRAM], @@ -123,6 +123,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[ dnl are almost assuredly the ones desired. AS_CASE([${host_cpu}], [i?86],[multiarch_libsubdir="lib/i386-${host_os}"], + [armv7l],[multiarch_libsubdir="lib/arm-${host_os}"], [multiarch_libsubdir="lib/${host_cpu}-${host_os}"] ) |