From: bangerth Date: Sun, 6 Nov 2011 14:08:41 +0000 (+0000) Subject: Also identify Intel C compiler as such despite its best attempt at misidentifying... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10d8f4d72b4416590492ea5ae51a4132048da90d;p=dealii-svn.git Also identify Intel C compiler as such despite its best attempt at misidentifying itself. git-svn-id: https://svn.dealii.org/trunk@24726 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 26d5548ed0..57e6fd4022 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -1237,10 +1237,20 @@ dnl ------------------------------------------------------------- AC_DEFUN(DEAL_II_DETERMINE_CC_BRAND, dnl [ if test "$GCC" = "yes" ; then + dnl Verify that we indeed have a compiler that identifies + dnl itself as GCC CC_VERSION_STRING=`($CC -v 2>&1) | grep "gcc version"` if test "x$CC_VERSION_STRING" = "x" ; then GCC=no fi + + dnl Then icc came along and started to identify itself as + dnl icc version 12.1.0 (gcc version 4.2.1 compatibility) + dnl which also doesn't help... + CC_VERSION_STRING=`($CC -v 2>&1) | grep "icc"` + if test "x$CC_VERSION_STRING" != "x" ; then + GCC=no + fi fi if test "$GCC" = yes ; then diff --git a/deal.II/configure b/deal.II/configure index 203928a9e0..3ecc6dd836 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 24565 . +# From configure.in Revision: 24724 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.68 for deal.II 7.2.pre. # @@ -5070,9 +5070,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "$GCC" = "yes" ; then - CC_VERSION_STRING=`($CC -v 2>&1) | grep "gcc version"` + CC_VERSION_STRING=`($CC -v 2>&1) | grep "gcc version"` if test "x$CC_VERSION_STRING" = "x" ; then GCC=no + fi + + CC_VERSION_STRING=`($CC -v 2>&1) | grep "icc"` + if test "x$CC_VERSION_STRING" != "x" ; then + GCC=no fi fi diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h index 57e437c3d1..2570604967 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -43,7 +43,7 @@ these should really be unambiguous.
  • Fixed: Intel's ICC compiler identifies itself as icpc version 12.1.0 (gcc version 4.2.1 compatibility) which we mistook as being -GCC version 4.2. This is now fixed. +GCC version 4.2. The same is true for the Intel C compiler. This is now fixed.
    (Wolfgang Bangerth, 2011/11/05)