Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

Unified Diff: pylib/gyp/generator/ninja.py

Issue 10270020: ninja windows: make sure that .s files aren't passed to compiler (Closed) Base URL: https://gyp.googlecode.com/svn/trunk
Patch Set: comment Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | test/win/asm-files/asm-files.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pylib/gyp/generator/ninja.py
diff --git a/pylib/gyp/generator/ninja.py b/pylib/gyp/generator/ninja.py
index 13548341ac1bc49cf5a7100ef47c58fb1442b360..d66cee11e80896b4a41b8d2e04603e8a6e336351 100644
--- a/pylib/gyp/generator/ninja.py
+++ b/pylib/gyp/generator/ninja.py
@@ -716,7 +716,11 @@ class NinjaWriter:
obj_ext = self.obj_ext
if ext in ('cc', 'cpp', 'cxx'):
command = 'cxx'
- elif ext in ('c', 's', 'S'):
+ elif ext == 'c' or (ext in ('s', 'S') and self.flavor != 'win'):
+ # TODO(scottmg): .s files won't be handled by the Windows compiler.
+ # We could add support for .asm, though that's only supported on
+ # x86. Currently not used in Chromium in favor of other third-party
+ # assemblers.
command = 'cc'
elif self.flavor == 'mac' and ext == 'm':
command = 'objc'
« no previous file with comments | « no previous file | test/win/asm-files/asm-files.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698