Index: pylib/gyp/generator/ninja.py |
diff --git a/pylib/gyp/generator/ninja.py b/pylib/gyp/generator/ninja.py |
index 5cf3de71c52b7674fcac86aa1728746fc6af3c30..abcf7be4d4cc36c8b216d64b8d5fe69e2ab9c2e1 100644 |
--- a/pylib/gyp/generator/ninja.py |
+++ b/pylib/gyp/generator/ninja.py |
@@ -1470,14 +1470,17 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params, |
restat=True) |
# Note that ldflags goes at the end so that it has the option of |
# overriding default settings earlier in the command line. |
+ command=('%s gyp-win-tool link-wrapper $arch ' |
bradn
2012/07/31 17:19:23
style guide requires spaces around =
|
+ '$ld /nologo /OUT:$out /PDB:$out.pdb @$out.rsp' % |
+ sys.executable) |
+ if not os.environ.get('LD_target'): |
+ command+=(' && %s gyp-win-tool manifest-wrapper $arch ' |
bradn
2012/07/31 17:19:23
style guide requires spaces around +=
|
+ '$mt -nologo -manifest $manifests -out:$out.manifest' % |
+ sys.executable) |
master_ninja.rule( |
'link', |
description='LINK $out', |
- command=('%s gyp-win-tool link-wrapper $arch ' |
- '$ld /nologo /OUT:$out /PDB:$out.pdb @$out.rsp && ' |
- '%s gyp-win-tool manifest-wrapper $arch ' |
- '$mt -nologo -manifest $manifests -out:$out.manifest' % |
- (sys.executable, sys.executable)), |
+ command=command, |
rspfile='$out.rsp', |
rspfile_content='$in_newline $libs $ldflags') |
else: |