diff options
| author | bungeman@chromium.org <bungeman@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af> | 2014-06-05 18:26:16 +0000 |
|---|---|---|
| committer | bungeman@chromium.org <bungeman@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af> | 2014-06-05 18:26:16 +0000 |
| commit | 23d664144f9209ec5d43d896ee7d4e399db7d783 (patch) | |
| tree | aacbc487f0d5c6f56b54000b4b12c4d032c4d7d3 | |
| parent | 41f4de6e6db4f20180b93431719bae16633b540a (diff) | |
| download | gyp-23d664144f9209ec5d43d896ee7d4e399db7d783.tar.gz | |
Fix msvs-ninja clean build command / target.
Currently the clean command is specified as
ninja.exe -C $(OutDir) -t clean $(ProjectName)
but _BuildCommandLineForRuleRaw sees 'clean' as a path, calling _FixPath on it.
This is not a problem for Chromium because it does not set --generator-output.
As a result fixpath_prefix is None and no adjustment is made to paths.
Skia, however, does set --generator-output, and so an attempt is made to adjust
paths with _FixPath. As a result, with Skia the msvs 'Clean' target contains
ninja.exe -C $(OutDir) -t ../../gyp/clean $(ProjectName)
This change changes the command to
ninja.exe -C $(OutDir) -tclean $(ProjectName)
which it valid for ninja, but _BuildCommandLineForRuleRaw will not _FixPath it.
BUG=skia:2439
R=sbaig1@bloomberg.net
Review URL: https://codereview.chromium.org/314163003
git-svn-id: http://gyp.googlecode.com/svn/trunk@1929 78cadc50-ecff-11dd-a971-7dbc132099af
| -rw-r--r-- | pylib/gyp/generator/msvs.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pylib/gyp/generator/msvs.py b/pylib/gyp/generator/msvs.py index a4ebd7c5..b18bff18 100644 --- a/pylib/gyp/generator/msvs.py +++ b/pylib/gyp/generator/msvs.py @@ -1828,8 +1828,7 @@ def _InitNinjaFlavor(params, target_list, target_dicts): path_to_ninja, '-C', '$(OutDir)', - '-t', - 'clean', + '-tclean', '$(ProjectName)', ] |