Mercurial > hg > nginx
diff auto/cc/name @ 4512:cbed47593ce0 stable-1.0
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 |
line wrap: on
line diff
--- 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 '^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"