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/ninja.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/ninja.py')
| -rw-r--r-- | tools/gyp/pylib/gyp/generator/ninja.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/tools/gyp/pylib/gyp/generator/ninja.py b/tools/gyp/pylib/gyp/generator/ninja.py index 163281b3e3..0555a4a90d 100644 --- a/tools/gyp/pylib/gyp/generator/ninja.py +++ b/tools/gyp/pylib/gyp/generator/ninja.py @@ -1931,10 +1931,6 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params, ld = os.path.join(build_to_root, value) if key == 'LD.host': ld_host = os.path.join(build_to_root, value) - if key == 'LDXX': - ldxx = os.path.join(build_to_root, value) - if key == 'LDXX.host': - ldxx_host = os.path.join(build_to_root, value) if key == 'NM': nm = os.path.join(build_to_root, value) if key == 'NM.host': @@ -2028,7 +2024,6 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params, CommandWithWrapper('CXX.host', wrappers, cxx_host)) if flavor == 'win': master_ninja.variable('ld_host', ld_host) - master_ninja.variable('ldxx_host', ldxx_host) else: master_ninja.variable('ld_host', CommandWithWrapper( 'LINK', wrappers, ld_host)) @@ -2153,13 +2148,13 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params, restat=True, command=mtime_preserving_solink_base % {'suffix': '@$link_file_list'}, rspfile='$link_file_list', - rspfile_content='-Wl,--start-group $in $solibs $libs -Wl,--end-group', + rspfile_content='-Wl,--start-group $in -Wl,--end-group $solibs $libs', pool='link_pool') master_ninja.rule( 'link', description='LINK $out', command=('$ld $ldflags -o $out ' - '-Wl,--start-group $in $solibs $libs -Wl,--end-group'), + '-Wl,--start-group $in -Wl,--end-group $solibs $libs'), pool='link_pool') elif flavor == 'win': master_ninja.rule( |