]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Work around a problem with intel icc 12.1...
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 8 Nov 2011 13:29:47 +0000 (13:29 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 8 Nov 2011 13:29:47 +0000 (13:29 +0000)
git-svn-id: https://svn.dealii.org/trunk@24737 0785d39b-7218-0410-832d-ea1e28bc413d

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

index 6f5ec23313b9d467de48e764b20fe3757b13544f..f5a45c65b0657839a680606b6b9db6b4a9662b5a 100644 (file)
@@ -1198,7 +1198,9 @@ AC_DEFUN(DEAL_II_CHECK_CXX1X_COMPONENTS, dnl
     CXXFLAGSO="$CXXFLAGSO $1"
 
     AC_DEFINE(DEAL_II_CAN_USE_CXX1X, 1,
-              [Defined if the compiler we use supports the upcoming C++1x standard.])
+              [Defined if the compiler we use supports the C++2011 standard
+               well enough to allow using the standard library classes instead
+               of the corresponding BOOST classes.])
 
 
     dnl Also test for a couple C++1x things that we don't use in the library
@@ -1240,6 +1242,15 @@ AC_DEFUN(DEAL_II_CHECK_CXX1X_COMPONENTS, dnl
     dnl and that we could use to test these features.
   else
     AC_MSG_RESULT(no)
+
+    dnl Intel icc 12.1 has this crazy behavior where it needs -std=c++0x
+    dnl to compile BOOST, but it fails every single one of the header
+    dnl file tests above. So we end up here. Work around this by using
+    dnl the flag even though we can't use a single piece of functionality.
+    if test "x$GXX_VERSION" = "xintel_icc12" ; then
+      CXXFLAGSG="$CXXFLAGSG $1"
+      CXXFLAGSO="$CXXFLAGSO $1"
+    fi
   fi
 ])
 
index 46f426646609dd7150f7deb48fdca26ac8f891d2..ebb640e383c112b8e10c7dd15c7af598cd134fe4 100755 (executable)
@@ -4470,6 +4470,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
               else
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
+
+                    if test "x$GXX_VERSION" = "xintel_icc12" ; then
+      CXXFLAGSG="$CXXFLAGSG "-std=c++0x""
+      CXXFLAGSO="$CXXFLAGSO "-std=c++0x""
+    fi
   fi
 
   fi
@@ -5198,6 +5203,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
               else
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
+
+                    if test "x$GXX_VERSION" = "xintel_icc12" ; then
+      CXXFLAGSG="$CXXFLAGSG "-std=c++0x""
+      CXXFLAGSO="$CXXFLAGSO "-std=c++0x""
+    fi
   fi
 
   fi

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.