diff options
Diffstat (limited to '')
| -rw-r--r-- | auto/cc/gcc | 4 | ||||
| -rw-r--r-- | auto/cc/icc | 12 | ||||
| -rw-r--r-- | auto/cc/name | 6 | ||||
| -rw-r--r-- | auto/cc/owc | 6 |
4 files changed, 10 insertions, 18 deletions
diff --git a/auto/cc/gcc b/auto/cc/gcc index 17bb13883..6f1a953a6 100644 --- a/auto/cc/gcc +++ b/auto/cc/gcc @@ -19,7 +19,7 @@ have=NGX_COMPILER value="\"gcc $NGX_GCC_VER\"" . auto/define CC_TEST_FLAGS="-pipe" -ngx_feature="gcc -pipe switch" +ngx_feature="gcc -pipe switch" ngx_feature_name= ngx_feature_run=no ngx_feature_incs= @@ -125,7 +125,7 @@ fi CFLAGS="$CFLAGS ${NGX_GCC_OPT:-O} -W" CFLAGS="$CFLAGS -Wall -Wpointer-arith" -#CFLAGS="$CFLAGS -Wconversion" +#CFLAGS="$CFLAGS -Wconversion" #CFLAGS="$CFLAGS -Winline" diff --git a/auto/cc/icc b/auto/cc/icc index 6af9713b2..16cb2bb42 100644 --- a/auto/cc/icc +++ b/auto/cc/icc @@ -106,7 +106,7 @@ CFLAGS="$CFLAGS -wd1419" case "$NGX_ICC_VER" in 9.*) - # "cc" clobber ignored, warnings for Liunx's htons() + # "cc" clobber ignored, warnings for Liunx's htonl()/htons() CFLAGS="$CFLAGS -wd1469" # explicit conversion of a 64-bit integral type to a smaller # integral type @@ -114,19 +114,11 @@ case "$NGX_ICC_VER" in # conversion from pointer to same-sized integral type, # warning on offsetof() CFLAGS="$CFLAGS -wd1684" - - # STUB - # non-POD class type passed through ellipsis, Linux only ? - CFLAGS="$CFLAGS -wd1595" ;; 8.*) - # "cc" clobber ignored, warnings for Liunx's htons() + # "cc" clobber ignored, warnings for Liunx's htonl()/htons() CFLAGS="$CFLAGS -wd1469" - - # STUB - # non-POD class type passed through ellipsis, Linux only ? - CFLAGS="$CFLAGS -wd1595" ;; *) diff --git a/auto/cc/name b/auto/cc/name index 7202aaa26..aa3440cb9 100644 --- a/auto/cc/name +++ b/auto/cc/name @@ -5,7 +5,7 @@ echo $ngx_n "checking for C compiler ...$ngx_c" -if [ $CC = cl ]; then +if [ "$CC" = cl ]; then if `$NGX_WINE $CC -v 2>&1 \ | grep '^Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 13' \ 2>&1 >/dev/null`; then @@ -19,12 +19,12 @@ if [ $CC = cl ]; then fi else -if [ $CC = wcl386 ]; then +if [ "$CC" = wcl386 ]; then NGX_CC_NAME=owc echo " Open Watcom C compiler" else -if [ $CC = bcc32 ]; then +if [ "$CC" = bcc32 ]; then NGX_CC_NAME=bcc echo " Borland C++ compiler" diff --git a/auto/cc/owc b/auto/cc/owc index c2ab8f7ba..c8088d213 100644 --- a/auto/cc/owc +++ b/auto/cc/owc @@ -8,7 +8,7 @@ # maximize speed CFLAGS="$CFLAGS -ot" -# reorder instructions for best pipeline usage +# reorder instructions for best pipeline usage CFLAGS="$CFLAGS -op" # inline intrinsic functions CFLAGS="$CFLAGS -oi" @@ -24,7 +24,7 @@ case $CPU in CPU_OPT="-5r" # stack-based arguments passing conventions #CPU_OPT="-5s" - ;; + ;; pentiumpro) # optimize for Pentium Pro, Pentium II and Pentium III @@ -63,7 +63,7 @@ CFLAGS="$CFLAGS -zq" #have=NGX_HAVE_C99_VARIADIC_MACROS . auto/have -# the precompiled headers +# the precompiled headers CORE_DEPS="$CORE_DEPS $NGX_OBJS/ngx_config.pch" NGX_PCH="$NGX_OBJS/ngx_config.pch" NGX_BUILD_PCH="-fhq=$NGX_OBJS/ngx_config.pch" |