summaryrefslogtreecommitdiff
path: root/tools/gyp
diff options
context:
space:
mode:
authorDaniel Bevenius <daniel.bevenius@gmail.com>2016-10-18 16:41:26 +0200
committerJames M Snell <jasnell@gmail.com>2017-03-24 08:28:43 -0700
commit6a09a69ec9d36b705e9bde2ac1a193566a702d96 (patch)
tree81f61fba07225ae47e95bcc7f7827946635f0131 /tools/gyp
parenta8a042a6d336af816461fc26fe0527a68b68f3aa (diff)
downloadandroid-node-v8-6a09a69ec9d36b705e9bde2ac1a193566a702d96.tar.gz
android-node-v8-6a09a69ec9d36b705e9bde2ac1a193566a702d96.tar.bz2
android-node-v8-6a09a69ec9d36b705e9bde2ac1a193566a702d96.zip
build: enable cctest to use generated objects
This commit tries to make it simpler to add unit tests (cctest) for code that needs to test node core funtionality but that might not be appropriate as an addon or a JavaScript test. An example of this could be adding functionality targeted for situations when Node itself is embedded. Currently it was not as easy, or efficient, as one would have hoped to add such tests. The object output directories vary for different operating systems which we need to link to so that we don't have an additional compilation step. PR-URL: https://github.com/nodejs/node/pull/11956 Ref: https://github.com/nodejs/node/pull/9163 Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'tools/gyp')
-rw-r--r--tools/gyp/pylib/gyp/generator/make.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/gyp/pylib/gyp/generator/make.py b/tools/gyp/pylib/gyp/generator/make.py
index 39373b9844..d9adddaa9b 100644
--- a/tools/gyp/pylib/gyp/generator/make.py
+++ b/tools/gyp/pylib/gyp/generator/make.py
@@ -147,7 +147,7 @@ cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^)
# special "figure out circular dependencies" flags around the entire
# input list during linking.
quiet_cmd_link = LINK($(TOOLSET)) $@
-cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) -Wl,--end-group $(LIBS)
+cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) $(LIBS) -Wl,--end-group
# We support two kinds of shared objects (.so):
# 1) shared_library, which is just bundling together many dependent libraries