summaryrefslogtreecommitdiffhomepage
path: root/auto
diff options
context:
space:
mode:
authorMax Romanov <max.romanov@nginx.com>2017-11-29 18:49:08 +0300
committerMax Romanov <max.romanov@nginx.com>2017-11-29 18:49:08 +0300
commit1add36a7ee543b993aeba10c04a4abfc0244c3f8 (patch)
tree80f15bfff54b432a259daba3b9d15a86528983c0 /auto
parent3781950badda9a937fdfaac25013006d9e106c67 (diff)
downloadunit-1add36a7ee543b993aeba10c04a4abfc0244c3f8.tar.gz
unit-1add36a7ee543b993aeba10c04a4abfc0244c3f8.tar.bz2
Using --ld-opt when linking modules.
Diffstat (limited to '')
-rw-r--r--auto/make2
-rw-r--r--auto/modules/php4
-rw-r--r--auto/modules/python4
3 files changed, 5 insertions, 5 deletions
diff --git a/auto/make b/auto/make
index f590f3eb..27b937fb 100644
--- a/auto/make
+++ b/auto/make
@@ -18,7 +18,7 @@ CFLAGS = $NXT_CFLAGS $NXT_CC_OPT $CFLAGS
NXT_EXEC_LINK = $NXT_EXEC_LINK $NXT_LD_OPT
NXT_SHARED_LOCAL_LINK = $NXT_SHARED_LOCAL_LINK $NXT_LD_OPT
-NXT_MODULE_LINK = $NXT_MODULE_LINK $NXT_LD_OPT
+NXT_MODULE_LINK = $NXT_MODULE_LINK
.PHONY: $NXT_DAEMON
$NXT_DAEMON: $NXT_BUILD_DIR/$NXT_DAEMON
diff --git a/auto/modules/php b/auto/modules/php
index f3d59087..daeb0b68 100644
--- a/auto/modules/php
+++ b/auto/modules/php
@@ -157,8 +157,8 @@ all: ${NXT_PHP_MODULE}
${NXT_PHP_MODULE}: $NXT_BUILD_DIR/${NXT_PHP_MODULE}.unit.so
$NXT_BUILD_DIR/${NXT_PHP_MODULE}.unit.so: $nxt_objs
- $NXT_MODULE_LINK -o $NXT_BUILD_DIR/${NXT_PHP_MODULE}.unit.so \\
- $nxt_objs ${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS}
+ \$(NXT_MODULE_LINK) -o $NXT_BUILD_DIR/${NXT_PHP_MODULE}.unit.so \\
+ $nxt_objs ${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS} $NXT_LD_OPT
install: ${NXT_PHP_MODULE}-install
diff --git a/auto/modules/python b/auto/modules/python
index 9e3ced74..f006d87b 100644
--- a/auto/modules/python
+++ b/auto/modules/python
@@ -154,8 +154,8 @@ all: ${NXT_PYTHON_MODULE}
${NXT_PYTHON_MODULE}: $NXT_BUILD_DIR/${NXT_PYTHON_MODULE}.unit.so
$NXT_BUILD_DIR/${NXT_PYTHON_MODULE}.unit.so: $nxt_objs
- $NXT_MODULE_LINK -o $NXT_BUILD_DIR/${NXT_PYTHON_MODULE}.unit.so \\
- $nxt_objs $NXT_PYTHON_LIBS
+ \$(NXT_MODULE_LINK) -o $NXT_BUILD_DIR/${NXT_PYTHON_MODULE}.unit.so \\
+ $nxt_objs $NXT_PYTHON_LIBS $NXT_LD_OPT
install: ${NXT_PYTHON_MODULE}-install