Bug 1445668 - Don't hide includes when -showIncludes is explicitly passed to cl.exe, r=gps

python/mozbuild/mozbuild/action/cl.py

@@ -65,6 +65,7 @@ def InvokeClWithDependencyGeneration(cmdline):
     # The deps target lives here
     depstarget = os.path.basename(target) + ".pp"
 
+    showincludes = '-showIncludes' in cmdline
     cmdline += ['-showIncludes']
 
     mk = Makefile()
@@ -82,11 +83,13 @@ def InvokeClWithDependencyGeneration(cmdline):
             dep = normcase(dep)
             if ' ' not in dep:
                 rule.add_dependencies([dep])
-        else:
+            # Hide the line by returning early
-            # Make sure we preserve the relevant output from cl. mozprocess
+            if not showincludes:
-            # swallows the newline delimiter, so we need to re-add it.
+                return
-            sys.stdout.write(line)
+        # Make sure we preserve the relevant output from cl. mozprocess
-            sys.stdout.write('\n')
+        # swallows the newline delimiter, so we need to re-add it.
+        sys.stdout.write(line)
+        sys.stdout.write('\n')
 
     # We need to ignore children because MSVC can fire up a background process
     # during compilation. This process is cleaned up on its own. If we kill it,