diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-02-27 16:23:44 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-02-27 16:23:44 +0000 |
| commit | 075e852a4eec38b59de233dc6cbc1704def3f29c (patch) | |
| tree | 183ef007ace30e2d2bc0c5a17ff345626d4d6aae | |
| parent | 1c57fb87905926519e2aef149b645d069328489e (diff) | |
| download | nginx-075e852a4eec38b59de233dc6cbc1704def3f29c.tar.gz nginx-075e852a4eec38b59de233dc6cbc1704def3f29c.tar.bz2 | |
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
| -rw-r--r-- | auto/cc/name | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/auto/cc/name b/auto/cc/name index 598f879a0..7860c69e2 100644 --- a/auto/cc/name +++ b/auto/cc/name @@ -64,16 +64,16 @@ if [ "$CC" = bcc32 ]; then echo " + using Borland 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 'gcc version' >/dev/null 2>&1`; then + NGX_CC_NAME=gcc + echo " + using GNU 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" |