diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-06-07 09:01:46 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-06-07 09:01:46 +0000 |
| commit | d253abefc4c51fc2b43502564fff2d3218abeea8 (patch) | |
| tree | 5aad00c0e3a756f00d655e2157983440ff590f2a | |
| parent | 8a9171fa30be2ad64a849e9d916b33d3c42bb2d5 (diff) | |
| download | nginx-d253abefc4c51fc2b43502564fff2d3218abeea8.tar.gz nginx-d253abefc4c51fc2b43502564fff2d3218abeea8.tar.bz2 | |
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
Diffstat (limited to '')
| -rw-r--r-- | auto/cc/conf | 1 | ||||
| -rw-r--r-- | auto/cc/gcc | 2 | ||||
| -rw-r--r-- | auto/feature | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/auto/cc/conf b/auto/cc/conf index 482390029..dacb079c7 100644 --- 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 8e5422e08..772b92582 100644 --- 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 cd71e27b1..1bd334551 100644 --- 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= |