diff auto/cc/icc @ 296:2ceaee987f37 NGINX_0_5_18

nginx 0.5.18 *) Feature: the ngx_http_sub_filter_module. *) Feature: the "$upstream_http_..." variables. *) Feature: now the $upstream_status and $upstream_response_time variables keep data about all upstreams before X-Accel-Redirect. *) Bugfix: a segmentation fault occurred in master process after first reconfiguration and receiving any signal if nginx was built with ngx_http_perl_module and perl did not support multiplicity; bug appeared in 0.5.9. *) Bugfix: if perl did not support multiplicity, then after reconfiguration perl code did not work; bug appeared in 0.3.38.
author Igor Sysoev <http://sysoev.ru>
date Thu, 19 Apr 2007 00:00:00 +0400
parents 38e7b94d63ac
children 5a4401b9551b
line wrap: on
line diff
--- a/auto/cc/icc
+++ b/auto/cc/icc
@@ -5,7 +5,7 @@
 # Intel C++ compiler 7.1, 8.0, 8.1, 9.0
 
 NGX_ICC_VER=`$CC -V 2>&1 | grep 'Version' 2>&1 \
-                         | sed -e 's/^.* Version \(.*\)   Build.*$/\1/'`
+                         | sed -e 's/^.* Version \([^ ]*\) *Build.*$/\1/'`
 
 echo " + icc version: $NGX_ICC_VER"
 
@@ -26,6 +26,11 @@ case "$NGX_ICC_VER" in
         IPO="-ipo"
     ;;
 
+    # 8.1.38 under FreeBSD can not link -ipo
+    8.1)
+        IPO="-ip"
+    ;;
+
     *)
         IPO="-ipo -ipo_obj"
     ;;