phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-27 03:33:27 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge #18558: build: Fix boost detection for arch armv7l

Browse source 
da0842dcd4 build: Update ax_boost_mase.m4 to the latest serial (Hennadii Stepanov)

Pull request description:

  Picked from the upstream 90814f1895

  Fix #17010.

  This PR is [alternative](https://github.com/bitcoin/bitcoin/issues/17010#issuecomment-610651736) to #18501.

ACKs for top commit:
  laanwj:
    ACK da0842dcd4

Tree-SHA512: 5e43e12c524e4ea6b967c9be02c81a75948eac6cf55b819e3339222a2e3414731581d40af3524ad865abae7c5247c190448ebf2aa5e0d9a338edb501cc23ba38
This commit is contained in:
Wladimir J. van der Laan 2020-04-08 16:27:18 +02:00
commit b3c3d9a518
No known key found for this signature in database
GPG key ID: 1E4AED62986CD25D
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build-aux/m4/ax_boost_base.m4
View file

@ -33,7 +33,7 @@
# and this notice are preserved. This file is offered as-is, without any # and this notice are preserved. This file is offered as-is, without any
# warranty. # warranty.
#serial 47 #serial 48
# example boost program (need to pass version) # example boost program (need to pass version)
m4_define([_AX_BOOST_BASE_PROGRAM], m4_define([_AX_BOOST_BASE_PROGRAM],
@ -123,6 +123,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
dnl are almost assuredly the ones desired. dnl are almost assuredly the ones desired.
AS_CASE([${host_cpu}], AS_CASE([${host_cpu}],
[i?86],[multiarch_libsubdir="lib/i386-${host_os}"], [i?86],[multiarch_libsubdir="lib/i386-${host_os}"],
[armv7l],[multiarch_libsubdir="lib/arm-${host_os}"],
[multiarch_libsubdir="lib/${host_cpu}-${host_os}"] [multiarch_libsubdir="lib/${host_cpu}-${host_os}"]
) )