Fijxu/nginx-quic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge r3368, r3392:

Browse source 
./configure related fixes:

*) test invalid --with-ld-opt in right place
*) do not add NGX_GCC_OPT twice: it is added later with -W
This commit is contained in:
Igor Sysoev 2010-06-07 09:01:46 +00:00
parent d916bacca5
commit 5427dc9ee5
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
auto/cc/conf
View file

@ -104,6 +104,7 @@ else
fi fi
CFLAGS="$CFLAGS $NGX_CC_OPT" CFLAGS="$CFLAGS $NGX_CC_OPT"
NGX_TEST_LD_OPT="$NGX_LD_OPT"
if [ "$NGX_PLATFORM" != win32 ]; then if [ "$NGX_PLATFORM" != win32 ]; then

2
auto/cc/gcc
View file

@ -51,8 +51,6 @@ esac
#NGX_GCC_OPT="-Os" #NGX_GCC_OPT="-Os"
NGX_GCC_OPT="-O" NGX_GCC_OPT="-O"
CFLAGS="$CFLAGS $NGX_GCC_OPT"
#CFLAGS="$CFLAGS -fomit-frame-pointer" #CFLAGS="$CFLAGS -fomit-frame-pointer"
case $CPU in case $CPU in

2
auto/feature
View file

@ -39,7 +39,7 @@ END
ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS $ngx_feature_inc_path \ ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS $ngx_feature_inc_path \
-o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs" -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_TEST_LD_OPT $ngx_feature_libs"
ngx_feature_inc_path= ngx_feature_inc_path=