From d35af986468da6f61d5a660f13b260810323fb55 Mon Sep 17 00:00:00 2001 From: Marvin Greenberg Date: Wed, 12 Feb 2014 14:16:43 -0500 Subject: [PATCH] Change to only add -stdlib on OSX versions that have libc++ Use better test for clang --- configure.ac | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d05eb1802..aead05c21 100644 --- a/configure.ac +++ b/configure.ac @@ -352,10 +352,14 @@ if test x"$enable_cpp11_testing" = xyes; then fi fi -# On darwin before Mavericks when using clang, need to ensure using -# libc++ for tests and examples to run under mono +# On darwin 10.7,10.8,10.9 using clang++, need to ensure using +# libc++ for tests and examples to run under mono. May affect +# other language targets as well - problem is an OSX incompatibility +# between libraries depending on libstdc++ and libc++. +CLANGXX= +$CXX -v 2>&1 | grep -i clang >/dev/null && CLANGXX=yes case $host in - *-*-darwin*) if test "$CXX" = "clang++"; + *-*-darwin11* | *-*-darwin12* |*-*-darwin13* ) if test "$CLANGXX" = "yes"; then PLATCXXFLAGS="$PLATCXXFLAGS -stdlib=libc++" fi;; *) ;;