Index: pylib/gyp/generator/ninja.py |
diff --git a/pylib/gyp/generator/ninja.py b/pylib/gyp/generator/ninja.py |
index 54c79e5c28b3669647a19bd5b01ef558379a4d45..07a5ac3ef4f72d8f5a272e46bfc48817d81730c6 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, |
Nico
2012/04/30 20:54:48
Nit: s/,/./ at the end of this line, s/but we/We/
scottmg
2012/04/30 20:56:50
Done.
|
+ # but 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' |