Mercurial > hg > nginx
comparison auto/cc/conf @ 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 | 7af8276b1c2f |
children |
comparison
equal
deleted
inserted
replaced
3574:724e5cd44164 | 3575:fe084c435dc3 |
---|---|
102 CC_TEST_FLAGS="$CC_TEST_FLAGS $NGX_CC_OPT" | 102 CC_TEST_FLAGS="$CC_TEST_FLAGS $NGX_CC_OPT" |
103 | 103 |
104 fi | 104 fi |
105 | 105 |
106 CFLAGS="$CFLAGS $NGX_CC_OPT" | 106 CFLAGS="$CFLAGS $NGX_CC_OPT" |
107 NGX_TEST_LD_OPT="$NGX_LD_OPT" | |
107 | 108 |
108 | 109 |
109 if [ "$NGX_PLATFORM" != win32 ]; then | 110 if [ "$NGX_PLATFORM" != win32 ]; then |
110 | 111 |
111 if test -n "$NGX_LD_OPT"; then | 112 if test -n "$NGX_LD_OPT"; then |