2004-10-21 23:34:38 +08:00
|
|
|
|
|
|
|
# Copyright (C) Igor Sysoev
|
|
|
|
|
|
|
|
|
2005-02-22 22:40:13 +08:00
|
|
|
# Intel C++ compiler 7.1, 8.0, 8.1
|
2004-10-21 23:34:38 +08:00
|
|
|
|
2005-06-07 23:56:31 +08:00
|
|
|
NGX_ICC_VER=`$CC -V 2>&1 | grep 'Version' 2>&1 \
|
|
|
|
| sed -e 's/^.* Version \(.*\) Build.*$/\1/'`
|
|
|
|
|
|
|
|
echo " + icc version: $NGX_ICC_VER"
|
|
|
|
|
|
|
|
|
2004-10-21 23:34:38 +08:00
|
|
|
# optimizations
|
|
|
|
|
|
|
|
CFLAGS="$CFLAGS -O"
|
2005-03-19 20:38:37 +08:00
|
|
|
# inline the functions declared with __inline
|
2004-10-21 23:34:38 +08:00
|
|
|
#CFLAGS="$CFLAGS -Ob1"
|
|
|
|
# inline any function, at the compiler's discretion
|
|
|
|
CFLAGS="$CFLAGS -Ob2"
|
|
|
|
|
|
|
|
# single-file IP optimizations
|
|
|
|
#IPO="-ip"
|
|
|
|
# multi-file IP optimizations
|
|
|
|
IPO="-ipo -ipo_obj"
|
|
|
|
CFLAGS="$CFLAGS $IPO"
|
|
|
|
CORE_LINK="$CORE_LINK $IPO"
|
2004-11-26 00:17:31 +08:00
|
|
|
CORE_LINK="$CORE_LINK -opt_report_file=$NGX_OBJS/opt_report_file"
|
2004-10-21 23:34:38 +08:00
|
|
|
|
|
|
|
case $CPU in
|
|
|
|
pentium)
|
|
|
|
# optimize for Pentium and Athlon
|
|
|
|
CPU_OPT="-march=pentium"
|
|
|
|
;;
|
|
|
|
|
|
|
|
pentiumpro)
|
|
|
|
# optimize for Pentium Pro, Pentium II and Pentium III
|
|
|
|
CPU_OPT="-mcpu=pentiumpro -march=pentiumpro"
|
|
|
|
;;
|
|
|
|
|
|
|
|
pentium4)
|
|
|
|
# optimize for Pentium 4, default
|
|
|
|
CPU_OPT="-march=pentium4"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
CFLAGS="$CFLAGS $CPU_OPT"
|
|
|
|
|
|
|
|
if [ ".$PCRE_OPT" = "." ]; then
|
|
|
|
PCRE_OPT="-O $IPO $CPU_OPT"
|
|
|
|
fi
|
|
|
|
|
|
|
|
if [ ".$MD5_OPT" = "." ]; then
|
|
|
|
MD5_OPT="-O $IPO $CPU_OPT"
|
|
|
|
fi
|
|
|
|
|
|
|
|
if [ ".$ZLIB_OPT" = "." ]; then
|
|
|
|
ZLIB_OPT="-O $IPO $CPU_OPT"
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
# warnings
|
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
CFLAGS="$CFLAGS -w2"
|
|
|
|
|
|
|
|
# disable some warnings
|
|
|
|
|
|
|
|
# invalid type conversion: "int" to "char *"
|
|
|
|
CFLAGS="$CFLAGS -wd171"
|
|
|
|
# argument is incompatible with corresponding format string conversion
|
|
|
|
CFLAGS="$CFLAGS -wd181"
|
|
|
|
# zero used for undefined preprocessing identifier
|
|
|
|
CFLAGS="$CFLAGS -wd193"
|
2005-05-27 02:12:40 +08:00
|
|
|
#the format string ends before this argument
|
|
|
|
CFLAGS="$CFLAGS -wd268"
|
2005-03-19 20:38:37 +08:00
|
|
|
# invalid format string conversion
|
|
|
|
CFLAGS="$CFLAGS -wd269"
|
|
|
|
# conversion from "long long" to "size_t" may lose significant bits
|
|
|
|
CFLAGS="$CFLAGS -wd810"
|
|
|
|
# parameter was never referenced
|
|
|
|
CFLAGS="$CFLAGS -wd869"
|
|
|
|
|
|
|
|
# STUB
|
|
|
|
# enumerated type mixed with another type
|
|
|
|
CFLAGS="$CFLAGS -wd188"
|
|
|
|
# controlling expression is constant
|
|
|
|
CFLAGS="$CFLAGS -wd279"
|
|
|
|
# operands are evaluated in unspecified order
|
|
|
|
CFLAGS="$CFLAGS -wd981"
|
|
|
|
# external definition with no prior declaration
|
|
|
|
CFLAGS="$CFLAGS -wd1418"
|
|
|
|
# external declaration in primary source file
|
|
|
|
CFLAGS="$CFLAGS -wd1419"
|
2005-06-07 23:56:31 +08:00
|
|
|
|
|
|
|
case "$NGX_ICC_VER" in
|
|
|
|
8.*)
|
|
|
|
# "cc" clobber ignored, warnings for Liunx's htons()
|
|
|
|
CFLAGS="$CFLAGS -wd1469"
|
|
|
|
|
|
|
|
# STUB
|
|
|
|
# non-POD class type passed through ellipsis
|
|
|
|
CFLAGS="$CFLAGS -wd1595"
|
|
|
|
;;
|
|
|
|
|
|
|
|
*)
|
|
|
|
;;
|
|
|
|
esac
|
nginx-0.1.14-RELEASE import
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
2005-01-18 21:03:58 +08:00
|
|
|
|
2004-10-21 23:34:38 +08:00
|
|
|
# stop on warning
|
|
|
|
CFLAGS="$CFLAGS -Werror"
|
|
|
|
|
|
|
|
# debug
|
|
|
|
CFLAGS="$CFLAGS -g"
|