Mercurial > hg > nginx-quic

comparison auto/cc/name @ 4512:cbed47593ce0 stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge of r4474, r4493: configure/build fixes. *) Fixed build with embedded perl and --with-openssl. *) Configure: moved icc detection before gcc. New versions of icc confuse auto/cc/name due to introduced handling of a "icc -v".
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 05 Mar 2012 12:58:10 +0000
parents 4919fb357a5d
children 1f908d2dde8d
comparison
equal deleted inserted replaced
4511:83c26de984ef 4512:cbed47593ce0
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"