summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-03-23 20:30:25 +0000
committerIgor Sysoev <igor@sysoev.ru>2009-03-23 20:30:25 +0000
commit0f825e64404431962bc68b3ca0b6c52305d0ac27 (patch)
tree6f362ccbd5beb15357be82ff7e46c509f2525622
parent92d543deaa7f90a0fbd8c1e53e4d0418dec9bfc8 (diff)
downloadnginx-0f825e64404431962bc68b3ca0b6c52305d0ac27.tar.gz
nginx-0f825e64404431962bc68b3ca0b6c52305d0ac27.tar.bz2
fix Linux sendfile32() test broken in 0.3.36
Diffstat (limited to '')
-rw-r--r--auto/os/linux10
1 files changed, 7 insertions, 3 deletions
diff --git a/auto/os/linux b/auto/os/linux
index 580a92ada..698886fa8 100644
--- a/auto/os/linux
+++ b/auto/os/linux
@@ -11,7 +11,8 @@ CORE_SRCS="$UNIX_SRCS $LINUX_SRCS"
ngx_spacer='
'
-CC_AUX_FLAGS="$CC_AUX_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
+cc_aux_flags="$CC_AUX_FLAGS"
+CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
# Linux kernel version
@@ -60,7 +61,7 @@ fi
# sendfile()
-CC_AUX_FLAGS="$CC_AUX_FLAGS -D_GNU_SOURCE"
+CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE"
ngx_feature="sendfile()"
ngx_feature_name="NGX_HAVE_SENDFILE"
ngx_feature_run=yes
@@ -81,7 +82,7 @@ fi
# sendfile64()
-CC_AUX_FLAGS="$CC_AUX_FLAGS -D_FILE_OFFSET_BITS=64"
+CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
ngx_feature="sendfile64()"
ngx_feature_name="NGX_HAVE_SENDFILE64"
ngx_feature_run=yes
@@ -121,3 +122,6 @@ ngx_feature_libs=
ngx_feature_test="long mask = 0;
sched_setaffinity(0, 32, (cpu_set_t *) &mask)"
. auto/feature
+
+
+CC_AUX_FLAGS=$cc_aux_flags