diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2015-06-29 11:51:02 +0200 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-06-30 13:38:26 +0200 |
| commit | 99cbbc0a13fdd554bfc74e29de66fbefc00cfd2a (patch) | |
| tree | ab6c63a8e697f90c691153da0f5d54336a04ee94 /tools/gyp/pylib/gyp/generator/ninja.py | |
| parent | 05a73c0f259fd903622445b07bf9ce3f0d7a73a3 (diff) | |
| download | android-node-v8-99cbbc0a13fdd554bfc74e29de66fbefc00cfd2a.tar.gz android-node-v8-99cbbc0a13fdd554bfc74e29de66fbefc00cfd2a.tar.bz2 android-node-v8-99cbbc0a13fdd554bfc74e29de66fbefc00cfd2a.zip | |
tools: update gyp to 25ed9ac
Includes improved support for VS 2015[0] and makes it possible to build
with ninja again[1].
[0] https://codereview.chromium.org/1112753003
[1] https://codereview.chromium.org/1209553002
Fixes: https://github.com/nodejs/io.js/pull/2065
PR-URL: https://github.com/nodejs/io.js/pull/2074
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
Diffstat (limited to 'tools/gyp/pylib/gyp/generator/ninja.py')
| -rw-r--r-- | tools/gyp/pylib/gyp/generator/ninja.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/gyp/pylib/gyp/generator/ninja.py b/tools/gyp/pylib/gyp/generator/ninja.py index 6823f4ffbd..c2437822a7 100644 --- a/tools/gyp/pylib/gyp/generator/ninja.py +++ b/tools/gyp/pylib/gyp/generator/ninja.py @@ -1169,7 +1169,7 @@ class NinjaWriter(object): ldflags.append(r'-Wl,-rpath=\$$ORIGIN/%s' % rpath) ldflags.append('-Wl,-rpath-link=%s' % rpath) self.WriteVariableList(ninja_file, 'ldflags', - gyp.common.uniquer(map(self.ExpandSpecial, ldflags))) + map(self.ExpandSpecial, ldflags)) library_dirs = config.get('library_dirs', []) if self.flavor == 'win': |