From: Morgan Deters <mdeters@cs.nyu.edu>
Date: Thu, 14 Nov 2013 14:30:25 +0000 (-0500)
Subject: Minor fixes for Mac OS Mavericks
X-Git-Tag: cvc5-1.0.0~7250
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1acbb378d1658d613f9dc9788b8424455f445fc8;p=cvc5.git

Minor fixes for Mac OS Mavericks
---

diff --git a/config/boost.m4 b/config/boost.m4
index 8eb1b7b18..80a696881 100644
--- a/config/boost.m4
+++ b/config/boost.m4
@@ -406,7 +406,7 @@ dnl generated only once above (before we start the for loops).
       LDFLAGS=$boost_save_LDFLAGS
       LIBS=$boost_save_LIBS
       if test x"$Boost_lib" = xyes; then
-        Boost_lib_LDFLAGS="-L$boost_ldpath -Wl,-R$boost_ldpath"
+        Boost_lib_LDFLAGS="-L$boost_ldpath -Wl,-rpath -Wl,$boost_ldpath"
         Boost_lib_LDPATH="$boost_ldpath"
         break 6
       else
diff --git a/configure.ac b/configure.ac
index 1aad3ab6c..43f3325e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -766,8 +766,8 @@ typedef pb_ds::priority_queue<void, void, void> pq;])],
 
 If you're using a non-GCC compiler (such as clang), you may need to explicitly
 use the GNU standard C++ library by passing:
-    CXXFLAGS='-stdlib=libstdc++'
-as an argument to this configure script.
+    CXXFLAGS='-stdlib=libstdc++' CPPFLAGS='-stdlib=libstdc++'
+as arguments to this configure script.
 This is the case on Mac OS Mavericks, for example.])])])
 AC_LANG_POP([C++])
 AC_MSG_RESULT([$CVC4_PB_DS_NAMESPACE])