]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Check for compilers disguising as gcc, even though they are not.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Thu, 3 Jul 2003 19:20:37 +0000 (19:20 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Thu, 3 Jul 2003 19:20:37 +0000 (19:20 +0000)
git-svn-id: https://svn.dealii.org/trunk@7844 0785d39b-7218-0410-832d-ea1e28bc413d

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

index 18b518dbde718dbf537f9dea99dc8d544486071c..d61f403304791ca6dc06bef9ed5639484a3f36f5 100644 (file)
@@ -24,6 +24,18 @@ dnl
 dnl -------------------------------------------------------------
 AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl
 [
+  dnl It used to be the case that AC_PROG_CXX could properly detect
+  dnl whether we are working with gcc or not, but then Intel came across
+  dnl the brilliant idea to disguise it's compiler as gcc by setting
+  dnl GCC preprocessor variables for versions etc. So we have to figure
+  dnl out again whether this is really gcc
+  if test "$GXX" = "yes" ; then
+    GXX_VERSION_STRING=`($CXX -v 2>&1) | grep "gcc version"`
+    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"`
@@ -117,6 +129,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl
          version5="`echo $is_intel_icc | grep 'Version 5'`"
          version6="`echo $is_intel_icc | grep 'Version 6'`"
          version7="`echo $is_intel_icc | grep 'Version 7'`"
+         version8="`echo $is_intel_icc | grep 'Version 8'`"
           if test "x$version5" != "x" ; then
             AC_MSG_RESULT(C++ compiler is Intel ICC 5)
             GXX_VERSION=intel_icc5
@@ -126,10 +139,13 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl
           else if test "x$version7" != "x" ; then
             AC_MSG_RESULT(C++ compiler is Intel ICC 7)
             GXX_VERSION=intel_icc7
+          else if test "x$version8" != "x" ; then
+            AC_MSG_RESULT(C++ compiler is Intel ICC 8)
+            GXX_VERSION=intel_icc8
           else
             AC_MSG_RESULT(C++ compiler is Intel ICC)
             GXX_VERSION=intel_icc
-          fi fi fi
+          fi fi fi fi
         else
   
           dnl Or DEC's cxx compiler?
index 3216e5f13ecc52f57154732f0862cb2ec8fe53c5..d066bb61e137e073c37cfe3b756323ebf78de1b9 100755 (executable)
@@ -2672,6 +2672,13 @@ fi
 
 
 
+            if test "$GXX" = "yes" ; then
+    GXX_VERSION_STRING=`($CXX -v 2>&1) | grep "gcc version"`
+    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"`
     case "$GXX_VERSION_STRING" in
@@ -2762,6 +2769,7 @@ echo "${ECHO_T}C++ compiler is MIPSpro C++ compiler" >&6
          version5="`echo $is_intel_icc | grep 'Version 5'`"
          version6="`echo $is_intel_icc | grep 'Version 6'`"
          version7="`echo $is_intel_icc | grep 'Version 7'`"
+         version8="`echo $is_intel_icc | grep 'Version 8'`"
           if test "x$version5" != "x" ; then
             echo "$as_me:$LINENO: result: C++ compiler is Intel ICC 5" >&5
 echo "${ECHO_T}C++ compiler is Intel ICC 5" >&6
@@ -2774,11 +2782,15 @@ echo "${ECHO_T}C++ compiler is Intel ICC 6" >&6
             echo "$as_me:$LINENO: result: C++ compiler is Intel ICC 7" >&5
 echo "${ECHO_T}C++ compiler is Intel ICC 7" >&6
             GXX_VERSION=intel_icc7
+          else if test "x$version8" != "x" ; then
+            echo "$as_me:$LINENO: result: C++ compiler is Intel ICC 8" >&5
+echo "${ECHO_T}C++ compiler is Intel ICC 8" >&6
+            GXX_VERSION=intel_icc8
           else
             echo "$as_me:$LINENO: result: C++ compiler is Intel ICC" >&5
 echo "${ECHO_T}C++ compiler is Intel ICC" >&6
             GXX_VERSION=intel_icc
-          fi fi fi
+          fi fi fi fi
         else
 
                     is_dec_cxx="`($CXX -V 2>&1) | grep 'Compaq C++'`"
@@ -3097,8 +3109,8 @@ rm -f conftest.$ac_objext conftest.$ac_ext
           ;;
 
       portland_group)
-                                                                                                                 CXXFLAGSG="$CXXFLAGS -DDEBUG -g --display_error_number --diag_suppress 111 --diag_suppress 177 --diag_suppress 175"
-          CXXFLAGSO="$CXXFLAGS -fast -O2 --display_error_number --diag_suppress 111 --diag_suppress 177 --diag_suppress 175"
+                                                                                                                         CXXFLAGSG="$CXXFLAGS -DDEBUG -g --display_error_number --diag_suppress 111 --diag_suppress 177 --diag_suppress 175 --diag_suppress 284"
+          CXXFLAGSO="$CXXFLAGS -fast -O2 --display_error_number --diag_suppress 111 --diag_suppress 177 --diag_suppress 175 --diag_suppress 284"
           CXXFLAGSPIC="-Kpic"
           ;;
 

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.