Respecting AR environment variable to configure ar binary.

This commit is contained in:
Valentin Bartenev
2019-11-07 19:53:25 +03:00
parent 5d42599e33
commit cc82547782
3 changed files with 22 additions and 12 deletions

View File

@@ -14,6 +14,7 @@ mkdir -p $NXT_BUILD_DIR/src \
cat << END > $NXT_MAKEFILE cat << END > $NXT_MAKEFILE
CC = $CC CC = $CC
AR = $AR
CFLAGS = $NXT_CFLAGS $NXT_CC_OPT $CFLAGS CFLAGS = $NXT_CFLAGS $NXT_CC_OPT $CFLAGS

View File

@@ -21,7 +21,7 @@ case "$NXT_SYSTEM" in
Linux) Linux)
nxt_have=NXT_LINUX . auto/have nxt_have=NXT_LINUX . auto/have
NXT_STATIC_LINK="ar -r -c" NXT_STATIC_LINK="\$(AR) -r -c"
NXT_SHARED_LINK="\$(CC) -shared -Wl,-soname,libnxt.so" NXT_SHARED_LINK="\$(CC) -shared -Wl,-soname,libnxt.so"
NXT_SHARED_LOCAL_LINK="\$(CC) -shared \ NXT_SHARED_LOCAL_LINK="\$(CC) -shared \
-Wl,-soname,\\\$\$ORIGIN/libnxt.so" -Wl,-soname,\\\$\$ORIGIN/libnxt.so"
@@ -44,7 +44,7 @@ case "$NXT_SYSTEM" in
FreeBSD) FreeBSD)
nxt_have=NXT_FREEBSD . auto/have nxt_have=NXT_FREEBSD . auto/have
NXT_STATIC_LINK="ar -r -c" NXT_STATIC_LINK="\$(AR) -r -c"
NXT_SHARED_LINK="\$(CC) -shared -Wl,-soname,libnxt.so" NXT_SHARED_LINK="\$(CC) -shared -Wl,-soname,libnxt.so"
NXT_SHARED_LOCAL_LINK="\$(CC) -shared \ NXT_SHARED_LOCAL_LINK="\$(CC) -shared \
-Wl,-soname,\\\$\$ORIGIN/libnxt.so" -Wl,-soname,\\\$\$ORIGIN/libnxt.so"
@@ -71,14 +71,14 @@ case "$NXT_SYSTEM" in
case "$NXT_CC_NAME" in case "$NXT_CC_NAME" in
SunC): SunC):
NXT_STATIC_LINK="ar -r -c" NXT_STATIC_LINK="\$(AR) -r -c"
NXT_SHARED_LINK="\$(CC) -G -h libnxt.so" NXT_SHARED_LINK="\$(CC) -G -h libnxt.so"
NXT_SHARED_LOCAL_LINK="\$(CC) -G -h \\\$\$ORIGIN/libnxt.so" NXT_SHARED_LOCAL_LINK="\$(CC) -G -h \\\$\$ORIGIN/libnxt.so"
NXT_MODULE_LINK="\$(CC) -G" NXT_MODULE_LINK="\$(CC) -G"
;; ;;
*) *)
NXT_STATIC_LINK="ar -r -c" NXT_STATIC_LINK="\$(AR) -r -c"
NXT_SHARED_LINK="\$(CC) -shared -Wl,-soname,libnxt.so" NXT_SHARED_LINK="\$(CC) -shared -Wl,-soname,libnxt.so"
NXT_SHARED_LOCAL_LINK="\$(CC) -shared \ NXT_SHARED_LOCAL_LINK="\$(CC) -shared \
-Wl,-soname,\\\$\$ORIGIN/libnxt.so" -Wl,-soname,\\\$\$ORIGIN/libnxt.so"
@@ -106,7 +106,7 @@ case "$NXT_SYSTEM" in
# HFS+ volumes are caseless by default. # HFS+ volumes are caseless by default.
nxt_have=NXT_HAVE_CASELESS_FILESYSTEM . auto/have nxt_have=NXT_HAVE_CASELESS_FILESYSTEM . auto/have
NXT_STATIC_LINK="ar -r -c" NXT_STATIC_LINK="\$(AR) -r -c"
NXT_SHARED_LINK="\$(CC) -dynamiclib" NXT_SHARED_LINK="\$(CC) -dynamiclib"
NXT_SHARED_LOCAL_LINK="\$(CC) -dynamiclib \ NXT_SHARED_LOCAL_LINK="\$(CC) -dynamiclib \
-install_name @executable_path/libnxt.dylib" -install_name @executable_path/libnxt.dylib"
@@ -130,7 +130,7 @@ case "$NXT_SYSTEM" in
NetBSD) NetBSD)
nxt_have=NXT_NETBSD . auto/have nxt_have=NXT_NETBSD . auto/have
NXT_STATIC_LINK="ar -r -c" NXT_STATIC_LINK="\$(AR) -r -c"
NXT_SHARED_LINK="\$(CC) -shared" NXT_SHARED_LINK="\$(CC) -shared"
NXT_SHARED_LOCAL_LINK="\$(CC) -shared" NXT_SHARED_LOCAL_LINK="\$(CC) -shared"
NXT_MODULE_LINK="\$(CC) -shared" NXT_MODULE_LINK="\$(CC) -shared"
@@ -152,7 +152,7 @@ case "$NXT_SYSTEM" in
OpenBSD) OpenBSD)
nxt_have=NXT_OPENBSD . auto/have nxt_have=NXT_OPENBSD . auto/have
NXT_STATIC_LINK="ar -r -c" NXT_STATIC_LINK="\$(AR) -r -c"
NXT_SHARED_LINK="\$(CC) -shared" NXT_SHARED_LINK="\$(CC) -shared"
NXT_SHARED_LOCAL_LINK="\$(CC) -shared" NXT_SHARED_LOCAL_LINK="\$(CC) -shared"
NXT_MODULE_LINK="\$(CC) -shared" NXT_MODULE_LINK="\$(CC) -shared"
@@ -174,7 +174,7 @@ case "$NXT_SYSTEM" in
DragonFly) DragonFly)
nxt_have=NXT_DRAGONFLY . auto/have nxt_have=NXT_DRAGONFLY . auto/have
NXT_STATIC_LINK="ar -r -c" NXT_STATIC_LINK="\$(AR) -r -c"
NXT_SHARED_LINK="\$(CC) -shared" NXT_SHARED_LINK="\$(CC) -shared"
NXT_SHARED_LOCAL_LINK="\$(CC) -shared" NXT_SHARED_LOCAL_LINK="\$(CC) -shared"
NXT_MODULE_LINK="\$(CC) -shared" NXT_MODULE_LINK="\$(CC) -shared"
@@ -196,7 +196,7 @@ case "$NXT_SYSTEM" in
AIX) AIX)
nxt_have=NXT_AIX . auto/have nxt_have=NXT_AIX . auto/have
NXT_STATIC_LINK="ar -r -c" NXT_STATIC_LINK="\$(AR) -r -c"
NXT_SHARED_LINK="\$(CC) -G" NXT_SHARED_LINK="\$(CC) -G"
NXT_SHARED_LOCAL_LINK="\$(CC) -G" NXT_SHARED_LOCAL_LINK="\$(CC) -G"
NXT_MODULE_LINK="\$(CC) -G" NXT_MODULE_LINK="\$(CC) -G"
@@ -220,7 +220,7 @@ case "$NXT_SYSTEM" in
NXT_EXEC_LINK="\$(CC)" NXT_EXEC_LINK="\$(CC)"
NXT_SHARED_LOCAL_EXEC_LINK= NXT_SHARED_LOCAL_EXEC_LINK=
NXT_STATIC_LINK="ar -r -c" NXT_STATIC_LINK="\$(AR) -r -c"
NXT_SHARED_LINK="\$(CC) -shared" NXT_SHARED_LINK="\$(CC) -shared"
NXT_SHARED_LOCAL_LINK="\$(CC) -shared" NXT_SHARED_LOCAL_LINK="\$(CC) -shared"
NXT_MODULE_LINK="\$(CC) -shared" NXT_MODULE_LINK="\$(CC) -shared"
@@ -238,7 +238,7 @@ case "$NXT_SYSTEM" in
QNX) QNX)
nxt_have=NXT_QNX . auto/have nxt_have=NXT_QNX . auto/have
NXT_STATIC_LINK="ar -r -c" NXT_STATIC_LINK="\$(AR) -r -c"
NXT_SHARED_LINK="\$(CC) -shared" NXT_SHARED_LINK="\$(CC) -shared"
NXT_SHARED_LOCAL_LINK="\$(CC) -shared" NXT_SHARED_LOCAL_LINK="\$(CC) -shared"
NXT_MODULE_LINK="\$(CC) -shared" NXT_MODULE_LINK="\$(CC) -shared"
@@ -257,7 +257,7 @@ case "$NXT_SYSTEM" in
;; ;;
*) *)
NXT_STATIC_LINK="ar -r -c" NXT_STATIC_LINK="\$(AR) -r -c"
NXT_SHARED_LINK="\$(CC) -shared" NXT_SHARED_LINK="\$(CC) -shared"
NXT_SHARED_LOCAL_LINK="\$(CC) -shared" NXT_SHARED_LOCAL_LINK="\$(CC) -shared"
NXT_MODULE_LINK="\$(CC) -shared" NXT_MODULE_LINK="\$(CC) -shared"

View File

@@ -14,6 +14,7 @@ case "$NXT_SYSTEM" in
NXT_SYSTEM_PLATFORM=`uname -m 2>/dev/null` NXT_SYSTEM_PLATFORM=`uname -m 2>/dev/null`
echo=echo echo=echo
CC=${CC:-cc} CC=${CC:-cc}
AR=${AR:-ar}
;; ;;
FreeBSD | NetBSD | OpenBSD | DragonFly) FreeBSD | NetBSD | OpenBSD | DragonFly)
@@ -21,6 +22,7 @@ case "$NXT_SYSTEM" in
NXT_SYSTEM_PLATFORM=`uname -m 2>/dev/null` NXT_SYSTEM_PLATFORM=`uname -m 2>/dev/null`
echo=echo echo=echo
CC=${CC:-cc} CC=${CC:-cc}
AR=${AR:-ar}
;; ;;
SunOS) SunOS)
@@ -28,6 +30,7 @@ case "$NXT_SYSTEM" in
NXT_SYSTEM_PLATFORM=`uname -p 2>/dev/null` NXT_SYSTEM_PLATFORM=`uname -p 2>/dev/null`
echo=echo echo=echo
CC=${CC:-gcc} CC=${CC:-gcc}
AR=${AR:-ar}
NXT_TEST_CFLAGS="$NXT_TEST_CFLAGS -D_XOPEN_SOURCE" NXT_TEST_CFLAGS="$NXT_TEST_CFLAGS -D_XOPEN_SOURCE"
NXT_TEST_CFLAGS="$NXT_TEST_CFLAGS -D_XOPEN_SOURCE_EXTENDED=1" NXT_TEST_CFLAGS="$NXT_TEST_CFLAGS -D_XOPEN_SOURCE_EXTENDED=1"
@@ -40,6 +43,7 @@ case "$NXT_SYSTEM" in
NXT_SYSTEM_PLATFORM=`uname -m 2>/dev/null` NXT_SYSTEM_PLATFORM=`uname -m 2>/dev/null`
echo=echo echo=echo
CC=${CC:-cc} CC=${CC:-cc}
AR=${AR:-ar}
;; ;;
AIX) AIX)
@@ -47,6 +51,7 @@ case "$NXT_SYSTEM" in
NXT_SYSTEM_PLATFORM=`uname -p 2>/dev/null` NXT_SYSTEM_PLATFORM=`uname -p 2>/dev/null`
echo=echo echo=echo
CC=${CC:-gcc} CC=${CC:-gcc}
AR=${AR:-ar}
;; ;;
HP-UX) HP-UX)
@@ -54,6 +59,7 @@ case "$NXT_SYSTEM" in
NXT_SYSTEM_PLATFORM=`uname -m 2>/dev/null` NXT_SYSTEM_PLATFORM=`uname -m 2>/dev/null`
echo=echo echo=echo
CC=${CC:-gcc} CC=${CC:-gcc}
AR=${AR:-ar}
NXT_TEST_CFLAGS="$NXT_TEST_CFLAGS -D_XOPEN_SOURCE" NXT_TEST_CFLAGS="$NXT_TEST_CFLAGS -D_XOPEN_SOURCE"
NXT_TEST_CFLAGS="$NXT_TEST_CFLAGS -D_XOPEN_SOURCE_EXTENDED" NXT_TEST_CFLAGS="$NXT_TEST_CFLAGS -D_XOPEN_SOURCE_EXTENDED"
@@ -65,6 +71,7 @@ case "$NXT_SYSTEM" in
NXT_SYSTEM_PLATFORM=`uname -p 2>/dev/null` NXT_SYSTEM_PLATFORM=`uname -p 2>/dev/null`
echo=echo echo=echo
CC=${CC:-gcc} CC=${CC:-gcc}
AR=${AR:-ar}
;; ;;
MINGW*) MINGW*)
@@ -76,6 +83,7 @@ case "$NXT_SYSTEM" in
NXT_SYSTEM_PLATFORM=`uname -m 2>/dev/null` NXT_SYSTEM_PLATFORM=`uname -m 2>/dev/null`
echo=auto/echo/echo.exe echo=auto/echo/echo.exe
CC=${CC:-cl} CC=${CC:-cl}
AR=${AR:-ar}
NXT_WINDOWS=YES NXT_WINDOWS=YES
;; ;;
@@ -84,6 +92,7 @@ case "$NXT_SYSTEM" in
NXT_SYSTEM_PLATFORM=`uname -p 2>/dev/null` NXT_SYSTEM_PLATFORM=`uname -p 2>/dev/null`
echo=echo echo=echo
CC=${CC:-gcc} CC=${CC:-gcc}
AR=${AR:-ar}
;; ;;
esac esac