diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-02-09 14:31:07 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-02-09 14:31:07 +0000 |
| commit | aa8286101a57f11f2c1f9b5bf2d7ec121e74beea (patch) | |
| tree | d87e4d87bf388c7a3c630170d9ba43a8591007ed /auto/cc | |
| parent | 9ef28fa32a4713d365aa8d4cfc1f8732d6de47f6 (diff) | |
| download | nginx-aa8286101a57f11f2c1f9b5bf2d7ec121e74beea.tar.gz nginx-aa8286101a57f11f2c1f9b5bf2d7ec121e74beea.zip | |
nginx-0.1.18-RELEASE importrelease-0.1.18
*) Workaround: the default values of the devpoll_events and the
devpoll_changes directives changed from 512 to 32 to be compatible
with Solaris 10.
*) Bugfix: the proxy_set_x_var and fastcgi_set_var directives were not
inherited.
*) Bugfix: in the redirect rewrite directive the arguments were
concatenated with URI by the "&" rather than the "?".
*) Bugfix: the lines without trailing ";" in the file being included by
the ngx_http_geo_module were silently ignored.
*) Feature: the ngx_http_stub_status_module.
*) Bugfix: the unknown log format in the access_log directive caused
the segmentation fault.
*) Feature: the new "document_root" parameter of the fastcgi_params
directive.
*) Feature: the fastcgi_redirect_errors directive.
*) Feature: the new "break" modifier of the "rewrite" directive allows
to stop the rewrite/location cycle and sets the current
configuration to the request.
Diffstat (limited to 'auto/cc')
| -rw-r--r-- | auto/cc/conf | 4 | ||||
| -rw-r--r-- | auto/cc/gcc | 15 | ||||
| -rw-r--r-- | auto/cc/icc | 2 | ||||
| -rw-r--r-- | auto/cc/owc | 2 |
4 files changed, 13 insertions, 10 deletions
diff --git a/auto/cc/conf b/auto/cc/conf index 0a5db9e34..f064bca0d 100644 --- a/auto/cc/conf +++ b/auto/cc/conf @@ -2,6 +2,8 @@ # Copyright (C) Igor Sysoev +LINK="\$(CC)" + ngx_include_opt="-I " ngx_compile_opt="-c" ngx_objout="-o " @@ -56,7 +58,7 @@ else # # Compaq C V6.5-207 # # . auto/cc/ccc - ngx_include_opt="-I " + ngx_include_opt="-I" ;; # acc) diff --git a/auto/cc/gcc b/auto/cc/gcc index 24b908d26..d6647e52f 100644 --- a/auto/cc/gcc +++ b/auto/cc/gcc @@ -27,8 +27,13 @@ fi # optimizations -#CFLAGS="$CFLAGS -O2 -fomit-frame-pointer" -#CFLAGS="$CFLAGS -Os -fomit-frame-pointer" +#NGX_GCC_OPT="-O2" +#NGX_GCC_OPT="-Os" +NGX_GCC_OPT="-O" + +CFLAGS="$CFLAGS $NGX_GCC_OPT" + +#CFLAGS="$CFLAGS -fomit-frame-pointer" case $CPU in pentium) @@ -83,7 +88,9 @@ fi # warnings -CFLAGS="$CFLAGS -O -W" +# -W requires at least -O +CFLAGS="$CFLAGS ${NGX_GCC_OPT:-O} -W" + CFLAGS="$CFLAGS -Wall -Wpointer-arith" #CFLAGS="$CFLAGS -Wconversion" #CFLAGS="$CFLAGS -Winline" @@ -103,5 +110,3 @@ CFLAGS="$CFLAGS -g" if [ ".$CPP" = "." ]; then CPP="$CC -E" fi - -LINK="\$(CC)" diff --git a/auto/cc/icc b/auto/cc/icc index b036cb645..2195c10db 100644 --- a/auto/cc/icc +++ b/auto/cc/icc @@ -68,5 +68,3 @@ CFLAGS="$CFLAGS -Werror" # debug CFLAGS="$CFLAGS -g" - -LINK="\$(CC)" diff --git a/auto/cc/owc b/auto/cc/owc index 88ffdb1f8..06e5cc0e0 100644 --- a/auto/cc/owc +++ b/auto/cc/owc @@ -69,8 +69,6 @@ NGX_BUILD_PCH="-fhq=$NGX_OBJS/ngx_config.pch" NGX_USE_PCH="-fh=$NGX_OBJS/ngx_config.pch" -LINK="\$(CC)" - # the link flags, built target is NT GUI mode application CORE_LINK="$CORE_LINK -l=nt_win" |