aboutsummaryrefslogtreecommitdiff
path: root/src/m4
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2014-08-15 12:19:11 -0400
committerCory Fields <cory-nospam-@coryfields.com>2014-08-15 12:20:15 -0400
commit54c7df81f3e5f81cb91646acaf82074a3a6be3b2 (patch)
tree7fa438512cf45dab4f0152a80eaec0d8ea1a31a9 /src/m4
parent984ff68c679e9a40e14e791c6363c6136639a686 (diff)
build: Fix boost build on some platforms
When the libpath doesn't line up with the value from config.sub, we don't find the correct path to boost's libs. This adds a hack to try another path before giving up. Should close #3219.
Diffstat (limited to 'src/m4')
-rw-r--r--src/m4/ax_boost_base.m46
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