Mercurial > hg > nginx
comparison auto/cc/name @ 4492:4871a7dc12a9
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
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 27 Feb 2012 16:23:44 +0000 |
parents | d620f497c50f |
children | 1f908d2dde8d |
comparison
equal
deleted
inserted
replaced
4491:d11f86a16e3b | 4492:4871a7dc12a9 |
---|---|
62 if [ "$CC" = bcc32 ]; then | 62 if [ "$CC" = bcc32 ]; then |
63 NGX_CC_NAME=bcc | 63 NGX_CC_NAME=bcc |
64 echo " + using Borland C++ compiler" | 64 echo " + using Borland C++ compiler" |
65 | 65 |
66 else | 66 else |
67 if `$CC -V 2>&1 | grep '^Intel(R) C' >/dev/null 2>&1`; then | |
68 NGX_CC_NAME=icc | |
69 echo " + using Intel C++ compiler" | |
70 | |
71 else | |
67 if `$CC -v 2>&1 | grep 'gcc version' >/dev/null 2>&1`; then | 72 if `$CC -v 2>&1 | grep 'gcc version' >/dev/null 2>&1`; then |
68 NGX_CC_NAME=gcc | 73 NGX_CC_NAME=gcc |
69 echo " + using GNU C compiler" | 74 echo " + using GNU C compiler" |
70 | |
71 else | |
72 if `$CC -V 2>&1 | grep '^Intel(R) C' >/dev/null 2>&1`; then | |
73 NGX_CC_NAME=icc | |
74 echo " + using Intel C++ compiler" | |
75 | 75 |
76 else | 76 else |
77 if `$CC -V 2>&1 | grep 'Sun C' >/dev/null 2>&1`; then | 77 if `$CC -V 2>&1 | grep 'Sun C' >/dev/null 2>&1`; then |
78 NGX_CC_NAME=sunc | 78 NGX_CC_NAME=sunc |
79 echo " + using Sun C compiler" | 79 echo " + using Sun C compiler" |