You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
110 lines
3.7 KiB
110 lines
3.7 KiB
5 years ago
|
--- a/auto/os/conf 2019-10-31 17:17:33.194445276 +0100
|
||
|
+++ b/auto/os/conf 2019-10-31 17:19:51.780033224 +0100
|
||
|
@@ -21,7 +21,7 @@
|
||
|
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 @@
|
||
|
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_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 @@
|
||
|
# 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 @@
|
||
|
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 @@
|
||
|
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 @@
|
||
|
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 @@
|
||
|
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 @@
|
||
|
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 @@
|
||
|
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 @@
|
||
|
;;
|
||
|
|
||
|
*)
|
||
|
- 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"
|