]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Do not mistake intel icc 12 for gcc.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 5 Nov 2011 17:17:45 +0000 (17:17 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 5 Nov 2011 17:17:45 +0000 (17:17 +0000)
git-svn-id: https://svn.dealii.org/trunk@24722 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4
deal.II/configure
deal.II/doc/news/changes.h

index f0d766cfccf2a7bd47384c2a5d6ed16410764fdc..26d5548ed02e5bab864919209b56a7c7ea4102c9 100644 (file)
@@ -98,6 +98,16 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl
     fi
   fi
 
+  dnl Then icc came along and started to identify itself as
+  dnl    icpc version 12.1.0 (gcc version 4.2.1 compatibility)
+  dnl which also doesn't help...
+  if test "$GXX" = "yes" ; then
+    GXX_VERSION_STRING=`($CXX -v 2>&1) | grep "icpc"`
+    if test "x$GXX_VERSION_STRING" != "x" ; then
+      GXX=no
+    fi
+  fi
+
   if test "$GXX" = yes ; then
     dnl find out the right version
     GXX_VERSION_STRING=`($CXX -v 2>&1) | grep "gcc version"`
index 967157dbf87e47bd50b0ee77b1d32e90dcf36a4b..8594628719c0f6921914b101edf153e65b9883ad 100755 (executable)
@@ -3806,6 +3806,13 @@ fi
     fi
   fi
 
+        if test "$GXX" = "yes" ; then
+    GXX_VERSION_STRING=`($CXX -v 2>&1) | grep "icpc"`
+    if test "x$GXX_VERSION_STRING" != "x" ; then
+      GXX=no
+    fi
+  fi
+
   if test "$GXX" = yes ; then
         GXX_VERSION_STRING=`($CXX -v 2>&1) | grep "gcc version"`
 
index e27f51dae357a8f7a0ab450eda671d3b211b679c..4a9565f70a75d9b9f09fc10e2e383193c1322ee6 100644 (file)
@@ -34,6 +34,12 @@ inconvenience this causes.
 <h3>General</h3>
 
 <ol>
+<li> Fixed: Intel's ICC compiler identifies itself as <code>icpc version
+12.1.0 (gcc version 4.2.1 compatibility)</code> which we mistook as being
+GCC version 4.2. This is now fixed.
+<br>
+(Wolfgang Bangerth, 2011/11/05)
+
 <li> Fixed: deal.II could not be compiled with gcc 4.6.1 when MPI is
 enabled due to a missing include file in file
 <code>source/base/utilities.cc</code>. This is now fixed.

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.