summaryrefslogtreecommitdiffhomepage
path: root/auto/cc
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2005-02-22 14:40:13 +0000
committerIgor Sysoev <igor@sysoev.ru>2005-02-22 14:40:13 +0000
commitd039a2e193c9172e4f415b9304222e81804a69d0 (patch)
tree4571d4da7950e9464e788a4d68dc5111167de52c /auto/cc
parent174db74f2309e28c0e2b54e89b9e08afff187c7c (diff)
downloadnginx-d039a2e193c9172e4f415b9304222e81804a69d0.tar.gz
nginx-d039a2e193c9172e4f415b9304222e81804a69d0.tar.bz2
nginx-0.1.21-RELEASE importrelease-0.1.21
*) Bugfix: the ngx_http_stub_status_module showed incorrect statistics if "rtsig" method was used or if several worker process ran on SMP. *) Bugfix: nginx could not be built by the icc compiler on Linux or if the zlib-1.2.x library was building from sources. *) Bugfix: nginx could not be built on NetBSD 2.0.
Diffstat (limited to 'auto/cc')
-rw-r--r--auto/cc/icc4
-rw-r--r--auto/cc/name2
2 files changed, 3 insertions, 3 deletions
diff --git a/auto/cc/icc b/auto/cc/icc
index 2195c10db..47b91d781 100644
--- a/auto/cc/icc
+++ b/auto/cc/icc
@@ -2,7 +2,7 @@
# Copyright (C) Igor Sysoev
-# Intel C++ compiler 7.1, 8.0
+# Intel C++ compiler 7.1, 8.0, 8.1
# optimizations
@@ -57,7 +57,7 @@ fi
CFLAGS="$CFLAGS -w1"
#CFLAGS="$CFLAGS -w2"
-# disable the ICC 8.0 errors:
+# disable the ICC 8.1 errors:
# error #181: argument is incompatible with corresponding format
# string conversion
# error #269: invalid format string conversion
diff --git a/auto/cc/name b/auto/cc/name
index cbed6a741..fb4f49aaf 100644
--- a/auto/cc/name
+++ b/auto/cc/name
@@ -29,7 +29,7 @@ if [ $CC = bcc32 ]; then
echo " using Borland C++ compiler"
else
-if `$CC -v 2>&1 | grep '^gcc version' 2>&1 >/dev/null`; then
+if `$CC -v 2>&1 | grep 'gcc version' 2>&1 >/dev/null`; then
NGX_CC_NAME=gcc
echo " using GNU C compiler"