mirror of https://github.com/nginx/nginx
Merge of r4759, r4762, r4768: configure minor fixes.
*) Replaced a number of "else if" with "elif". *) Made sure to run configure in a "C" locale. Otherwise, we may fail to properly detect a version of compiler. *) Removed extraneous GCC warning flags.stable-1.2
parent
7ca2e6d24e
commit
a24d4d23f7
|
@ -155,9 +155,6 @@ case "$NGX_GCC_VER" in
|
|||
3.* | 4.* )
|
||||
# we have a lot of the unused function arguments
|
||||
CFLAGS="$CFLAGS -Wno-unused-parameter"
|
||||
CFLAGS="$CFLAGS -Wunused-function"
|
||||
CFLAGS="$CFLAGS -Wunused-variable"
|
||||
CFLAGS="$CFLAGS -Wunused-value"
|
||||
# 4.2.1 shows the warning in wrong places
|
||||
#CFLAGS="$CFLAGS -Wunreachable-code"
|
||||
;;
|
||||
|
|
36
auto/cc/name
36
auto/cc/name
|
@ -32,14 +32,14 @@ if [ "$CC" = cl ]; then
|
|||
NGX_CC_NAME=msvc10
|
||||
echo " + using Microsoft Visual C++ 10 compiler"
|
||||
|
||||
else if `$NGX_WINE $CC -v 2>&1 \
|
||||
elif `$NGX_WINE $CC -v 2>&1 \
|
||||
| grep '^Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 14' \
|
||||
>/dev/null 2>&1`; then
|
||||
|
||||
NGX_CC_NAME=msvc8
|
||||
echo " + using Microsoft Visual C++ 8 compiler"
|
||||
|
||||
else if `$NGX_WINE $CC -v 2>&1 \
|
||||
elif `$NGX_WINE $CC -v 2>&1 \
|
||||
| grep '^Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 13' \
|
||||
>/dev/null 2>&1`; then
|
||||
|
||||
|
@ -50,52 +50,36 @@ if [ "$CC" = cl ]; then
|
|||
NGX_CC_NAME=msvc
|
||||
echo " + using Microsoft Visual C++ compiler"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
else
|
||||
if [ "$CC" = wcl386 ]; then
|
||||
elif [ "$CC" = wcl386 ]; then
|
||||
NGX_CC_NAME=owc
|
||||
echo " + using Open Watcom C compiler"
|
||||
|
||||
else
|
||||
if [ "$CC" = bcc32 ]; then
|
||||
elif [ "$CC" = bcc32 ]; then
|
||||
NGX_CC_NAME=bcc
|
||||
echo " + using Borland C++ compiler"
|
||||
|
||||
else
|
||||
if `$CC -V 2>&1 | grep '^Intel(R) C' >/dev/null 2>&1`; then
|
||||
elif `$CC -V 2>&1 | grep '^Intel(R) C' >/dev/null 2>&1`; then
|
||||
NGX_CC_NAME=icc
|
||||
echo " + using Intel C++ compiler"
|
||||
|
||||
else
|
||||
if `$CC -v 2>&1 | grep 'gcc version' >/dev/null 2>&1`; then
|
||||
elif `$CC -v 2>&1 | grep 'gcc version' >/dev/null 2>&1`; then
|
||||
NGX_CC_NAME=gcc
|
||||
echo " + using GNU C compiler"
|
||||
|
||||
else
|
||||
if `$CC -V 2>&1 | grep 'Sun C' >/dev/null 2>&1`; then
|
||||
elif `$CC -V 2>&1 | grep 'Sun C' >/dev/null 2>&1`; then
|
||||
NGX_CC_NAME=sunc
|
||||
echo " + using Sun C compiler"
|
||||
|
||||
else
|
||||
if `$CC -V 2>&1 | grep '^Compaq C' >/dev/null 2>&1`; then
|
||||
elif `$CC -V 2>&1 | grep '^Compaq C' >/dev/null 2>&1`; then
|
||||
NGX_CC_NAME=ccc
|
||||
echo " + using Compaq C compiler"
|
||||
|
||||
else
|
||||
if `$CC -V 2>&1 | grep '^aCC: ' >/dev/null 2>&1`; then
|
||||
elif `$CC -V 2>&1 | grep '^aCC: ' >/dev/null 2>&1`; then
|
||||
NGX_CC_NAME=acc
|
||||
echo " + using HP aC++ compiler"
|
||||
|
||||
else
|
||||
NGX_CC_NAME=unknown
|
||||
|
||||
fi # acc
|
||||
fi # ccc
|
||||
fi # sunc
|
||||
fi # icc
|
||||
fi # gcc
|
||||
fi # bcc
|
||||
fi # owc
|
||||
fi # msvc
|
||||
fi
|
||||
|
|
|
@ -4,6 +4,9 @@
|
|||
# Copyright (C) Nginx, Inc.
|
||||
|
||||
|
||||
LC_ALL=C
|
||||
export LC_ALL
|
||||
|
||||
. auto/options
|
||||
. auto/init
|
||||
. auto/sources
|
||||
|
|
Loading…
Reference in New Issue