Mercurial > hg > nginx
changeset 3575:fe084c435dc3 stable-0.7
merge r3368, r3392:
./configure related fixes:
*) test invalid --with-ld-opt in right place
*) do not add NGX_GCC_OPT twice: it is added later with -W
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 07 Jun 2010 09:01:46 +0000 |
parents | 724e5cd44164 |
children | d87088142876 |
files | auto/cc/conf auto/cc/gcc auto/feature |
diffstat | 3 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/auto/cc/conf Mon Jun 07 08:51:48 2010 +0000 +++ b/auto/cc/conf Mon Jun 07 09:01:46 2010 +0000 @@ -104,6 +104,7 @@ fi CFLAGS="$CFLAGS $NGX_CC_OPT" +NGX_TEST_LD_OPT="$NGX_LD_OPT" if [ "$NGX_PLATFORM" != win32 ]; then
--- a/auto/cc/gcc Mon Jun 07 08:51:48 2010 +0000 +++ b/auto/cc/gcc Mon Jun 07 09:01:46 2010 +0000 @@ -51,8 +51,6 @@ #NGX_GCC_OPT="-Os" NGX_GCC_OPT="-O" -CFLAGS="$CFLAGS $NGX_GCC_OPT" - #CFLAGS="$CFLAGS -fomit-frame-pointer" case $CPU in
--- a/auto/feature Mon Jun 07 08:51:48 2010 +0000 +++ b/auto/feature Mon Jun 07 09:01:46 2010 +0000 @@ -39,7 +39,7 @@ 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=