Skip to content

Commit

Permalink
Merge #18558: build: Fix boost detection for arch armv7l
Browse files Browse the repository at this point in the history
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](#17010 (comment)) to #18501.

ACKs for top commit:
  laanwj:
    ACK da0842d

Tree-SHA512: 5e43e12c524e4ea6b967c9be02c81a75948eac6cf55b819e3339222a2e3414731581d40af3524ad865abae7c5247c190448ebf2aa5e0d9a338edb501cc23ba38
  • Loading branch information
laanwj committed Apr 8, 2020
2 parents 1f70185 + da0842d commit b3c3d9a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion build-aux/m4/ax_boost_base.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down Expand Up @@ -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}"]
)
Expand Down

0 comments on commit b3c3d9a

Please sign in to comment.