From 935a84673893b9326a777dc230f00054b678d4ea Mon Sep 17 00:00:00 2001 From: heltai Date: Mon, 13 Aug 2012 21:54:40 +0000 Subject: [PATCH] Reintroduced dynamic cast bug for 10.8 git-svn-id: https://svn.dealii.org/trunk@25959 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 9 ++++++--- deal.II/configure | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index b28c30cf7b..7e4a6f2227 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -1978,6 +1978,7 @@ AC_DEFUN(DEAL_II_CHECK_DYNAMIC_CAST_BUG, AC_MSG_CHECKING(for dynamic_cast problem with shared libs) if (cd contrib/config/tests/darwin-dynamic-cast ; \ + echo $CXX > compile_line; \ $CXX -dynamiclib BaseClass.cpp -o libDynamicCastTestLib.dylib ; \ $CXX -L. -lDynamicCastTestLib main.cc -o main ; \ ./main) ; then @@ -1987,9 +1988,11 @@ AC_DEFUN(DEAL_II_CHECK_DYNAMIC_CAST_BUG, AC_DEFINE(DEAL_II_HAVE_DARWIN_DYNACAST_BUG, 1, [Defined if the compiler has a bug with dynamic casting and dynamic libraries]) - CXXFLAGSG="$CXXFLAGSG -mmacosx-version-min=`sw_vers -productVersion`" - CXXFLAGSO="$CXXFLAGSO -mmacosx-version-min=`sw_vers -productVersion`" - LDFLAGS="$LDFLAGS -mmacosx-version-min=`sw_vers -productVersion`" + if(test "`sw_vers -productVersion`" != "10.8");then + CXXFLAGSG="$CXXFLAGSG -mmacosx-version-min=10.4" + CXXFLAGSO="$CXXFLAGSO -mmacosx-version-min=10.4" + LDFLAGS="$LDFLAGS -mmacosx-version-min=10.4" + fi fi rm -f contrib/config/tests/darwin-dynamic-cast/libDynamicCastTestLib.dylib rm -f contrib/config/tests/darwin-dynamic-cast/main.o diff --git a/deal.II/configure b/deal.II/configure index b46b3b03ff..6ffff9ca1d 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -9994,6 +9994,7 @@ if test "x$enableshared" = "xyes" ; then $as_echo_n "checking for dynamic_cast problem with shared libs... " >&6; } if (cd contrib/config/tests/darwin-dynamic-cast ; \ + echo $CXX > compile_line; \ $CXX -dynamiclib BaseClass.cpp -o libDynamicCastTestLib.dylib ; \ $CXX -L. -lDynamicCastTestLib main.cc -o main ; \ ./main) ; then @@ -10005,9 +10006,11 @@ $as_echo "yes" >&6; } ; $as_echo "#define DEAL_II_HAVE_DARWIN_DYNACAST_BUG 1" >>confdefs.h - CXXFLAGSG="$CXXFLAGSG -mmacosx-version-min=`sw_vers -productVersion`" - CXXFLAGSO="$CXXFLAGSO -mmacosx-version-min=`sw_vers -productVersion`" - LDFLAGS="$LDFLAGS -mmacosx-version-min=`sw_vers -productVersion`" + if(test "`sw_vers -productVersion`" != "10.8");then + CXXFLAGSG="$CXXFLAGSG -mmacosx-version-min=10.4" + CXXFLAGSO="$CXXFLAGSO -mmacosx-version-min=10.4" + LDFLAGS="$LDFLAGS -mmacosx-version-min=10.4" + fi fi rm -f contrib/config/tests/darwin-dynamic-cast/libDynamicCastTestLib.dylib rm -f contrib/config/tests/darwin-dynamic-cast/main.o -- 2.39.5