diff options
| author | Daniel Bevenius <daniel.bevenius@gmail.com> | 2016-10-18 16:41:26 +0200 |
|---|---|---|
| committer | Refael Ackermann <refack@gmail.com> | 2017-08-23 16:24:34 -0400 |
| commit | e78a79af8cfdd73dad0e676210eef4d73b361a7a (patch) | |
| tree | 9a9c8ab115010a54a2e0d39b2bbc1b59ced70314 /tools/gyp | |
| parent | 503916a04f067bbf20d9570a4ca126aa1c6aec66 (diff) | |
| download | android-node-v8-e78a79af8cfdd73dad0e676210eef4d73b361a7a.tar.gz android-node-v8-e78a79af8cfdd73dad0e676210eef4d73b361a7a.tar.bz2 android-node-v8-e78a79af8cfdd73dad0e676210eef4d73b361a7a.zip | |
gyp: enable cctest to use objects (gyp part)
this is a re-base of the gyp part of
6a09a69ec9d36b705e9bde2ac1a193566a702d96
after bumping GYP version to
https://chromium.googlesource.com/external/gyp/+/eb296f67da078ec01f5e3a9ea9cdc6d26d680161
Original-PR-URL: https://github.com/nodejs/node/pull/11956
Original-Ref: https://github.com/nodejs/node/pull/9163
Original-Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/12450
Reviewed-By: João Reis <reis@janeasystems.com>
Diffstat (limited to 'tools/gyp')
| -rw-r--r-- | tools/gyp/pylib/gyp/generator/make.py | 2 |
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 ca1d55ebee..f7f519b3e6 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 |