diff -uNr boost_1_58_0.orig/boost/config/compiler/clang.hpp boost_1_58_0/boost/config/compiler/clang.hpp
--- boost_1_58_0.orig/boost/config/compiler/clang.hpp	2015-03-24 14:27:48.000000000 -0400
+++ boost_1_58_0/boost/config/compiler/clang.hpp	2015-04-20 13:21:15.000000000 -0400
@@ -201,6 +201,16 @@
 #  define BOOST_NO_CXX11_INLINE_NAMESPACES
 #endif
 
+// Apple Clang uses libc++ by default on Mavericks (OS X 10.9)  and higher
+// Apple Clang uses libstdc++ by default on Mountain Lion (OS X 10.8) and lower
+
+#ifdef __APPLE__
+#include <ciso646>
+#ifndef _LIBCPP_VERSION
+#  define BOOST_APPLE_CLANG_NO_LIBCXX
+#endif
+#endif
+
 #if !__has_feature(cxx_override_control)
 #  define BOOST_NO_CXX11_FINAL
 #endif
diff -uNr boost_1_58_0.orig/boost/multi_index/detail/vartempl_support.hpp boost_1_58_0/boost/multi_index/detail/vartempl_support.hpp
--- boost_1_58_0.orig/boost/multi_index/detail/vartempl_support.hpp	2015-02-23 10:08:43.000000000 -0500
+++ boost_1_58_0/boost/multi_index/detail/vartempl_support.hpp	2015-04-20 13:21:15.000000000 -0400
@@ -42,7 +42,8 @@
 #include <boost/config.hpp>
 
 #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)||\
-    defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+    defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)||\
+    defined(BOOST_APPLE_CLANG_NO_LIBCXX)
 
 #include <boost/move/core.hpp>
 #include <boost/move/utility.hpp>
