technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Respecting AR environment variable to configure ar binary.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

24
auto/os/conf
View File

@@ -21,7 +21,7 @@ case "$NXT_SYSTEM" in
Linux)
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_LOCAL_LINK="\$(CC) -shared \
-Wl,-soname,\\\$\$ORIGIN/libnxt.so"
@@ -44,7 +44,7 @@ case "$NXT_SYSTEM" in
FreeBSD)
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_LOCAL_LINK="\$(CC) -shared \
-Wl,-soname,\\\$\$ORIGIN/libnxt.so"
@@ -71,14 +71,14 @@ case "$NXT_SYSTEM" in
case "$NXT_CC_NAME" in
SunC):
NXT_STATIC_LINK="ar -r -c"
NXT_STATIC_LINK="\$(AR) -r -c"
NXT_SHARED_LINK="\$(CC) -G -h libnxt.so"
NXT_SHARED_LOCAL_LINK="\$(CC) -G -h \\\$\$ORIGIN/libnxt.so"
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_LOCAL_LINK="\$(CC) -shared \
-Wl,-soname,\\\$\$ORIGIN/libnxt.so"
@@ -106,7 +106,7 @@ case "$NXT_SYSTEM" in
# HFS+ volumes are caseless by default.
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_LOCAL_LINK="\$(CC) -dynamiclib \
-install_name @executable_path/libnxt.dylib"
@@ -130,7 +130,7 @@ case "$NXT_SYSTEM" in
NetBSD)
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_LOCAL_LINK="\$(CC) -shared"
NXT_MODULE_LINK="\$(CC) -shared"
@@ -152,7 +152,7 @@ case "$NXT_SYSTEM" in
OpenBSD)
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_LOCAL_LINK="\$(CC) -shared"
NXT_MODULE_LINK="\$(CC) -shared"
@@ -174,7 +174,7 @@ case "$NXT_SYSTEM" in
DragonFly)
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_LOCAL_LINK="\$(CC) -shared"
NXT_MODULE_LINK="\$(CC) -shared"
@@ -196,7 +196,7 @@ case "$NXT_SYSTEM" in
AIX)
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_LOCAL_LINK="\$(CC) -G"
NXT_MODULE_LINK="\$(CC) -G"
@@ -220,7 +220,7 @@ case "$NXT_SYSTEM" in
NXT_EXEC_LINK="\$(CC)"
NXT_SHARED_LOCAL_EXEC_LINK=
NXT_STATIC_LINK="ar -r -c"
NXT_STATIC_LINK="\$(AR) -r -c"
NXT_SHARED_LINK="\$(CC) -shared"
NXT_SHARED_LOCAL_LINK="\$(CC) -shared"
NXT_MODULE_LINK="\$(CC) -shared"
@@ -238,7 +238,7 @@ case "$NXT_SYSTEM" in
QNX)
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_LOCAL_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_LOCAL_LINK="\$(CC) -shared"
NXT_MODULE_LINK="\$(CC) -shared"