mirror
/
nginx
mirror of https://github.com/nginx/nginx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge fab69eeaf5 into 61690b5dc0

This commit is contained in:
Orgad Shaneh 2025-12-07 22:37:56 -08:00 committed by GitHub
parent 61690b5dc0 fab69eeaf5
commit d158b2e7d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
auto/lib/pcre/make
View File

@ -91,7 +91,7 @@ $PCRE/src/pcre2.h: $PCRE/Makefile
$PCRE/Makefile: $NGX_MAKEFILE
cd $PCRE \\
&& if [ -f Makefile ]; then \$(MAKE) distclean; fi \\
&& CC="\$(CC)" CFLAGS="$PCRE_OPT" \\
&& CC="\$(CC)" CFLAGS="$PCRE_OPT" AR="\$(AR)" \\
./configure --disable-shared $PCRE_CONF_OPT
$PCRE/.libs/libpcre2-8.a: $PCRE/Makefile
@ -157,7 +157,7 @@ $PCRE/pcre.h: $PCRE/Makefile
$PCRE/Makefile: $NGX_MAKEFILE
cd $PCRE \\
&& if [ -f Makefile ]; then \$(MAKE) distclean; fi \\
&& CC="\$(CC)" CFLAGS="$PCRE_OPT" \\
&& CC="\$(CC)" CFLAGS="$PCRE_OPT" AR="\$(AR)" \\
./configure --disable-shared $PCRE_CONF_OPT
$PCRE/.libs/libpcre.a: $PCRE/Makefile

8
auto/lib/zlib/make
View File

@ -54,7 +54,7 @@ $ZLIB/libz.a: $NGX_MAKEFILE
cd $ZLIB \\
&& \$(MAKE) distclean \\
&& \$(MAKE) -f win32/Makefile.gcc \\
CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\
CFLAGS="$ZLIB_OPT" CC="\$(CC)" AR="\$(AR)" \\
libz.a
END
@ -77,7 +77,7 @@ $ZLIB/libz.a: $NGX_MAKEFILE
cd $ZLIB \\
&& \$(MAKE) distclean \\
&& cp contrib/asm586/match.S . \\
&& CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
&& CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" AR="\$(AR)" \\
./configure \\
&& \$(MAKE) OBJA=match.o libz.a
@ -94,7 +94,7 @@ $ZLIB/libz.a: $NGX_MAKEFILE
cd $ZLIB \\
&& \$(MAKE) distclean \\
&& cp contrib/asm686/match.S . \\
&& CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
&& CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" AR="\$(AR)" \\
./configure \\
&& \$(MAKE) OBJA=match.o libz.a
@ -126,7 +126,7 @@ if [ $done = NO ]; then
$ZLIB/libz.a: $NGX_MAKEFILE
cd $ZLIB \\
&& \$(MAKE) distclean \\
&& CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\
&& CFLAGS="$ZLIB_OPT" CC="\$(CC)" AR="\$(AR)" \\
./configure \\
&& \$(MAKE) libz.a