]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Reintroduced dynamic cast bug for 10.8
authorheltai <heltai@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 13 Aug 2012 21:54:40 +0000 (21:54 +0000)
committerheltai <heltai@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 13 Aug 2012 21:54:40 +0000 (21:54 +0000)
git-svn-id: https://svn.dealii.org/trunk@25959 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4
deal.II/configure

index b28c30cf7b3fc7b897dbb4ef89cfaeb176fa450f..7e4a6f22276e4aebea6950fa4e73a361563dba60 100644 (file)
@@ -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
index b46b3b03ffc476fb438fe8884db6f2906ac247b7..6ffff9ca1d3a8802c13aa74918e7b030c21621cf 100755 (executable)
@@ -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

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.