diff options
| author | Refael Ackermann <refack@gmail.com> | 2017-08-09 14:43:18 -0400 |
|---|---|---|
| committer | Refael Ackermann <refack@gmail.com> | 2017-08-23 16:24:28 -0400 |
| commit | 327077ce43866020eadaf3b58f7280a09ed0c348 (patch) | |
| tree | 04002b9263e8c89a2402af3243d7910f8abe76c2 /tools/gyp/pylib/gyp/generator/make.py | |
| parent | 01160dd6e901c7b3e70508c16bd8654e312d8486 (diff) | |
| download | android-node-v8-327077ce43866020eadaf3b58f7280a09ed0c348.tar.gz android-node-v8-327077ce43866020eadaf3b58f7280a09ed0c348.tar.bz2 android-node-v8-327077ce43866020eadaf3b58f7280a09ed0c348.zip | |
tools: update GYP to 324dd166
PR-URL: https://github.com/nodejs/node/pull/14718
Refs: https://chromium.googlesource.com/external/gyp/+/324dd166b7c0b39d513026fa52d6280ac6d56770
Refs: https://github.com/refack/GYP/commit/324dd166b7c0b39d513026fa52d6280ac6d56770
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'tools/gyp/pylib/gyp/generator/make.py')
| -rw-r--r-- | tools/gyp/pylib/gyp/generator/make.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/gyp/pylib/gyp/generator/make.py b/tools/gyp/pylib/gyp/generator/make.py index f7f519b3e6..e80ebaed78 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) $(LIBS) -Wl,--end-group +cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) -Wl,--end-group $(LIBS) # We support two kinds of shared objects (.so): # 1) shared_library, which is just bundling together many dependent libraries @@ -2074,10 +2074,10 @@ def GenerateOutput(target_list, target_dicts, data, params): 'AR.target': GetEnvironFallback(('AR_target', 'AR'), '$(AR)'), 'CXX.target': GetEnvironFallback(('CXX_target', 'CXX'), '$(CXX)'), 'LINK.target': GetEnvironFallback(('LINK_target', 'LINK'), '$(LINK)'), - 'CC.host': GetEnvironFallback(('CC_host', 'CC'), 'gcc'), - 'AR.host': GetEnvironFallback(('AR_host', 'AR'), 'ar'), - 'CXX.host': GetEnvironFallback(('CXX_host', 'CXX'), 'g++'), - 'LINK.host': GetEnvironFallback(('LINK_host', 'LINK'), '$(CXX.host)'), + 'CC.host': GetEnvironFallback(('CC_host',), 'gcc'), + 'AR.host': GetEnvironFallback(('AR_host',), 'ar'), + 'CXX.host': GetEnvironFallback(('CXX_host',), 'g++'), + 'LINK.host': GetEnvironFallback(('LINK_host',), '$(CXX.host)'), }) build_file, _, _ = gyp.common.ParseQualifiedTarget(target_list[0]) |