mirror of
https://github.com/nginx/nginx.git
synced 2025-06-07 17:52:38 +08:00
Pass AR for pcre and zlib.
Needed for cross-build.
This commit is contained in:
parent
3327353ec0
commit
fab69eeaf5
@ -90,7 +90,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
|
||||
@ -156,7 +156,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
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user