diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-18 19:48:38 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-18 20:17:58 +0200 |
| commit | a4f151f714d67da7850d94d44b824944d3f0d74d (patch) | |
| tree | 94cb52527774173748be301bb8172102aa425f89 | |
| parent | fad23a210bc61c784af0be4fc32cda6b75a4619b (diff) | |
| parent | 54c7df81f3e5f81cb91646acaf82074a3a6be3b2 (diff) | |
| download | bitcoin-a4f151f714d67da7850d94d44b824944d3f0d74d.tar.xz | |
Merge pull request #4704
54c7df8 build: Fix boost build on some platforms (Cory Fields)
| -rw-r--r-- | src/m4/ax_boost_base.m4 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/m4/ax_boost_base.m4 b/src/m4/ax_boost_base.m4 index e025a7e1ca..3f24d5ddc6 100644 --- a/src/m4/ax_boost_base.m4 +++ b/src/m4/ax_boost_base.m4 @@ -112,6 +112,12 @@ if test "x$want_boost" = "xyes"; then ;; esac + dnl some arches may advertise a cpu type that doesn't line up with their + dnl prefix's cpu type. For example, uname may report armv7l while libs are + dnl installed to /usr/lib/arm-linux-gnueabihf. Try getting the compiler's + dnl value for an extra chance of finding the correct path. + libsubdirs="lib/`$CXX -dumpmachine 2>/dev/null` $libsubdirs" + dnl first we check the system location for boost libraries dnl this location ist chosen if boost libraries are installed with the --layout=system option dnl or if you install boost with RPM |