|
From: <sv...@va...> - 2015-01-05 14:28:56
|
Author: florian
Date: Mon Jan 5 14:28:46 2015
New Revision: 14851
Log:
Fix compiler detection for ICC.
Patch by Gregory Czajkowski (gre...@ya...).
Part of fixing BZ #339542.
Modified:
trunk/configure.ac
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Jan 5 14:28:46 2015
@@ -136,9 +136,10 @@
is_clang="clang"
# Don't use -dumpversion with clang: it will always produce "4.2.1".
gcc_version=`${CC} --version | $SED -n -e 's/.*clang version \([0-9.]*\).*$/\1/p'`
-elif test "x`${CC} --version | $SED -n -e 's/icc.+\(ICC\).*/\1/p'`" = "ICC" ; then
+elif test "x`${CC} --version | $SED -n -e 's/icc.*\(ICC\).*/\1/p'`" = "xICC" ;
+then
is_clang="icc"
- gcc_version=`${CC} --version | $SED -n -e 's/icc.+\(ICC\).+([0-9.]+).*$/\1/p'`
+ gcc_version=`${CC} -dumpversion 2>/dev/null`
else
is_clang="notclang"
gcc_version=`${CC} -dumpversion 2>/dev/null`
@@ -156,7 +157,7 @@
applellvm-5.1|applellvm-6.0*)
AC_MSG_RESULT([ok (Apple LLVM version ${gcc_version})])
;;
- icc-1[3-9]*)
+ icc-1[[3-9]].*)
AC_MSG_RESULT([ok (ICC version ${gcc_version})])
;;
notclang-[[3-9]].*|notclang-[[1-9][0-9]]*)
|