]> git.kaiwu.me - njs.git/commitdiff
Allowing to configure ar binary.
authorDmitry Volyntsev <xeioex@nginx.com>
Fri, 12 Jul 2019 18:18:30 +0000 (21:18 +0300)
committerDmitry Volyntsev <xeioex@nginx.com>
Fri, 12 Jul 2019 18:18:30 +0000 (21:18 +0300)
auto/make
configure

index c01c0da58a3fd5c69f74aaa10dc7eb7486aaa2fd..26cbd37b8ada9a0462e4c5c9dd410d8ada489a41 100644 (file)
--- a/auto/make
+++ b/auto/make
@@ -15,6 +15,7 @@ cat << END > $NXT_MAKEFILE
 # This file is auto-generated by configure
 
 NXT_CC = ${CC}
+NXT_AR = ${AR}
 NXT_CFLAGS = ${NXT_CFLAGS} ${CFLAGS}
 
 default: $NXT_DEFAULT_TARGET
@@ -57,7 +58,7 @@ libnxt: $NXT_BUILD_DIR/libnxt.a
 $NXT_BUILD_DIR/libnxt.a: \\
        $NXT_BUILD_DIR/nxt_auto_config.h \\
        \$(NXT_LIB_OBJS)
-       ar -r -c $NXT_BUILD_DIR/libnxt.a \\
+       \$(NXT_AR) -r -c $NXT_BUILD_DIR/libnxt.a \\
                \$(NXT_LIB_OBJS)
 
 END
@@ -136,7 +137,7 @@ $NXT_BUILD_DIR/libnjs.a:   \\
        \$(NXT_LIB_OBJS) \\
        \$(NJS_LIB_OBJS)
 
-       ar -r -c $NXT_BUILD_DIR/libnjs.a \\
+       \$(NXT_AR) -r -c $NXT_BUILD_DIR/libnjs.a \\
                \$(NXT_LIB_OBJS) \\
                \$(NJS_LIB_OBJS)
 
index ddf19a0a406ccbf156fdeae6e8f272fdfa4d1744..d564bed0e4aa494a657cc4cbc064627c7dfb0451 100755 (executable)
--- a/configure
+++ b/configure
@@ -22,6 +22,7 @@ NXT_TEST_LIBS=${NXT_TEST_LIBS=}
 
 # Initialize variables with default if they are not defined.
 CC=${CC:-cc}
+AR=${AR:-ar}
 NXT_CFLAGS=${NXT_CFLAGS=}
 NXT_CC_OPT=${NXT_CC_OPT:--O}
 NXT_LD_OPT=${NXT_CC_OPT:--O}