From 41c28dc35ba7efaf9426a8b8f5597aee11b7db61 Mon Sep 17 00:00:00 2001
From: Peter Kuemmel <syntheticpp@gmx.net>
Date: Fri, 15 Jun 2012 01:45:18 +0200
Subject: [PATCH] Ninja: be more accurate when estimating the command line
 length

---
 Source/cmGlobalNinjaGenerator.cxx       | 3 ++-
 Source/cmNinjaNormalTargetGenerator.cxx | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 3af58a94d..30a4a07af 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -177,7 +177,8 @@ void cmGlobalNinjaGenerator::WriteBuild(std::ostream& os,
 
   // check if a response file rule should be used
   const std::string args = arguments.str();
-  if (cmdLineLimit > 0 && args.size() > (size_t)cmdLineLimit)
+  if (cmdLineLimit > 0 &&
+       (args.size() + + builds.str().size()) > (size_t)cmdLineLimit)
     builds << "_RSPFILE";
 
   os << builds.str() << args;
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 6f0833839..98d2fbac3 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -478,12 +478,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     symlinkVars["POST_BUILD"] = postBuildCmdLine;
   }
 
-  int cmdLineLimit = -1;
+  int cmdLineLimit;
 #ifdef _WIN32
-  cmdLineLimit = 8100;
+  cmdLineLimit = 8000;
 #else
-  // TODO
+  cmdLineLimit = -1; // TODO
 #endif
+
   // Write the build statement for this target.
   cmGlobalNinjaGenerator::WriteBuild(this->GetBuildFileStream(),
                                      comment.str(),