[nginx] svn commit: r4493 - trunk/auto/cc

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-02-27 16:23:44 +0000 (Mon, 27 Feb 2012)
New Revision: 4493

Log:
Configure: moved icc detection before gcc.

New versions of icc confuse auto/cc/name due to introduced handling
of a "icc -v":

$ icc -v
icc version 12.1.3 (gcc version 4.6.0 compatibility)
$ icc -V
Intel(R) C Compiler XE for applications running on IA-32, Version 12.1.3.293 Build 20120212
Copyright (C) 1985-2012 Intel Corporation.  All rights reserved.
FOR NON-COMMERCIAL USE ONLY

See report here:
http://mailman.nginx.org/pipermail/nginx/2012-February/032177.html


Modified:
   trunk/auto/cc/name

Modified: trunk/auto/cc/name
===================================================================
--- trunk/auto/cc/name	2012-02-27 11:43:40 UTC (rev 4492)
+++ trunk/auto/cc/name	2012-02-27 16:23:44 UTC (rev 4493)
@@ -64,16 +64,16 @@
     echo " + using Borland C++ compiler"
 
 else
+if `$CC -V 2>&1 | grep '^Intel(R) C' >/dev/null 2>&1`; then
+    NGX_CC_NAME=icc
+    echo " + using Intel C++ compiler"
+
+else
 if `$CC -v 2>&1 | grep 'gcc version' >/dev/null 2>&1`; then
     NGX_CC_NAME=gcc
     echo " + using GNU C compiler"
 
 else
-if `$CC -V 2>&1 | grep '^Intel(R) C' >/dev/null 2>&1`; then
-    NGX_CC_NAME=icc
-    echo " + using Intel C++ compiler"
-
-else
 if `$CC -V 2>&1 | grep 'Sun C' >/dev/null 2>&1`; then
     NGX_CC_NAME=sunc
     echo " + using Sun C compiler"