1.1 --- a/ambuild2/frontend/cpp.py	Mon Nov 18 12:46:05 2013 -0800
     1.2 +++ b/ambuild2/frontend/cpp.py	Mon Nov 18 12:55:07 2013 -0800
     1.3 @@ -51,7 +51,7 @@
     1.4      return ['/I', self.IncludePath(outputPath, includePath)]
     1.5  
     1.6    def preprocessArgs(self, sourceFile):
     1.7 -    return ['/showIncludes', '/nologo', '/E', '/c', sourceFile]
     1.8 +    return ['/showIncludes', '/nologo', '/P', '/c', sourceFile]
     1.9  
    1.10    def objectArgs(self, sourceFile, objFile):
    1.11      return ['/showIncludes', '/nologo', '/c', sourceFile, '/Fo' + objFile]
    1.12 @@ -414,7 +414,6 @@
    1.13          for include in (self.compiler.includes + self.compiler.cxxincludes):
    1.14            cl_argv += vendor.formatInclude(objectFile, include)
    1.15          cl_argv += vendor.preprocessArgs(sourceFile)
    1.16 -        cl_argv += ['/Fo' + encname + '.i']
    1.17  
    1.18          rc_argv = ['rc', '/nologo']
    1.19          for define in defines:

     2.1 --- a/ambuild2/task.py	Mon Nov 18 12:46:05 2013 -0800
     2.2 +++ b/ambuild2/task.py	Mon Nov 18 12:55:07 2013 -0800
     2.3 @@ -225,14 +225,12 @@
     2.4  
     2.5      with util.FolderChanger(task_folder):
     2.6        # Includes go to stderr when we preprocess to stdout.
     2.7 -      p, ignore, err = util.Execute(cl_argv)
     2.8 -      err, deps = util.ParseMSVCDeps(err)
     2.9 +      p, out, err = util.Execute(cl_argv)
    2.10 +      out, deps = util.ParseMSVCDeps(err)
    2.11        paths = self.rewriteDeps(deps)
    2.12  
    2.13        if p.returncode == 0:
    2.14          p, out, err = util.Execute(rc_argv)
    2.15 -      else:
    2.16 -        out = ''
    2.17          
    2.18      reply = {
    2.19        'ok': p.returncode == 0,