mirror of
https://github.com/nginx/nginx.git
synced 2025-02-25 18:55:26 -06:00
merge r3477:
zlib 1.2.4 compatibility
This commit is contained in:
parent
e66eb15b7b
commit
ce5508a3f4
@ -53,7 +53,7 @@ END
|
|||||||
|
|
||||||
$ZLIB/libz.a: $NGX_MAKEFILE
|
$ZLIB/libz.a: $NGX_MAKEFILE
|
||||||
cd $ZLIB \\
|
cd $ZLIB \\
|
||||||
&& \$(MAKE) clean \\
|
&& \$(MAKE) distclean \\
|
||||||
&& cp contrib/asm586/match.S . \\
|
&& cp contrib/asm586/match.S . \\
|
||||||
&& CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
|
&& CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
|
||||||
./configure \\
|
./configure \\
|
||||||
@ -70,7 +70,7 @@ END
|
|||||||
|
|
||||||
$ZLIB/libz.a: $NGX_MAKEFILE
|
$ZLIB/libz.a: $NGX_MAKEFILE
|
||||||
cd $ZLIB \\
|
cd $ZLIB \\
|
||||||
&& \$(MAKE) clean \\
|
&& \$(MAKE) distclean \\
|
||||||
&& cp contrib/asm686/match.S . \\
|
&& cp contrib/asm686/match.S . \\
|
||||||
&& CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
|
&& CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
|
||||||
./configure \\
|
./configure \\
|
||||||
@ -103,7 +103,7 @@ if [ $done = NO ]; then
|
|||||||
|
|
||||||
$ZLIB/libz.a: $NGX_MAKEFILE
|
$ZLIB/libz.a: $NGX_MAKEFILE
|
||||||
cd $ZLIB \\
|
cd $ZLIB \\
|
||||||
&& \$(MAKE) clean \\
|
&& \$(MAKE) distclean \\
|
||||||
&& CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\
|
&& CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\
|
||||||
./configure \\
|
./configure \\
|
||||||
&& \$(MAKE) libz.a
|
&& \$(MAKE) libz.a
|
||||||
|
Loading…
Reference in New Issue
Block a user