Pass AR for pcre and zlib.

Needed for cross-build.
This commit is contained in:
Orgad Shaneh 2025-02-12 10:39:29 +02:00
parent 3327353ec0
commit fab69eeaf5
2 changed files with 6 additions and 6 deletions

View File

@ -90,7 +90,7 @@ $PCRE/src/pcre2.h: $PCRE/Makefile
$PCRE/Makefile: $NGX_MAKEFILE $PCRE/Makefile: $NGX_MAKEFILE
cd $PCRE \\ cd $PCRE \\
&& if [ -f Makefile ]; then \$(MAKE) distclean; fi \\ && 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 ./configure --disable-shared $PCRE_CONF_OPT
$PCRE/.libs/libpcre2-8.a: $PCRE/Makefile $PCRE/.libs/libpcre2-8.a: $PCRE/Makefile
@ -156,7 +156,7 @@ $PCRE/pcre.h: $PCRE/Makefile
$PCRE/Makefile: $NGX_MAKEFILE $PCRE/Makefile: $NGX_MAKEFILE
cd $PCRE \\ cd $PCRE \\
&& if [ -f Makefile ]; then \$(MAKE) distclean; fi \\ && 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 ./configure --disable-shared $PCRE_CONF_OPT
$PCRE/.libs/libpcre.a: $PCRE/Makefile $PCRE/.libs/libpcre.a: $PCRE/Makefile

View File

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