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

diff --git a/auto/cc/conf b/auto/cc/conf
index 482390029222ed9107bd45cc0dfca82a22e0ac18..dacb079c762b99c17869e15c94213a8766f8b974 100644 (file)
--- a/auto/cc/conf
+++ b/auto/cc/conf
@@ -104,6 +104,7 @@ else
 fi
 
 CFLAGS="$CFLAGS $NGX_CC_OPT"
+NGX_TEST_LD_OPT="$NGX_LD_OPT"
 
 
 if [ "$NGX_PLATFORM" != win32 ]; then

diff --git a/auto/cc/gcc b/auto/cc/gcc
index 8e5422e0839b6ffeeab59255a945d421ec981071..772b9258286311f77b3128a966c0c138608abdae 100644 (file)
--- a/auto/cc/gcc
+++ b/auto/cc/gcc
@@ -51,8 +51,6 @@ esac
 #NGX_GCC_OPT="-Os"
 NGX_GCC_OPT="-O"
 
-CFLAGS="$CFLAGS $NGX_GCC_OPT"
-
 #CFLAGS="$CFLAGS -fomit-frame-pointer"
 
 case $CPU in

diff --git a/auto/feature b/auto/feature
index cd71e27b1cdf93f6a44aa78ee9d5e1fdc55388a0..1bd334551affe0a70b5d733c3fa6a970f344af0b 100644 (file)
--- a/auto/feature
+++ b/auto/feature
@@ -39,7 +39,7 @@ END
 
 
 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=