From 6332ba5a58f0114d1763c263950eae20b09eaa4b Mon Sep 17 00:00:00 2001
From: Peter Kuemmel <syntheticpp@gmx.net>
Date: Mon, 2 Jul 2012 10:30:29 +0200
Subject: [PATCH] Ninja: also consider rule command length for rsp file

---
 Source/cmGlobalNinjaGenerator.cxx       | 2 ++
 Source/cmGlobalNinjaGenerator.h         | 5 +++++
 Source/cmNinjaNormalTargetGenerator.cxx | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 6e8ce871f..23f42e440 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -557,6 +557,8 @@ void cmGlobalNinjaGenerator::AddRule(const std::string& name,
                                     rspfile,
                                     restat,
                                     generator);
+
+  this->RuleCmdLength[name] = command.size();
 }
 
 bool cmGlobalNinjaGenerator::HasRule(const std::string &name)
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index e939f6149..e5f809930 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -319,6 +319,8 @@ private:
 
   std::string ninjaCmd() const;
 
+  int GetRuleCmdLength(const std::string& name) { return RuleCmdLength[name]; }
+
 private:
   /// The file containing the build statement. (the relation ship of the
   /// compilation DAG).
@@ -335,6 +337,9 @@ private:
   /// The set of rules added to the generated build system.
   RulesSetType Rules;
 
+  /// Length of rule command, used by rsp file evaluation
+  std::map<std::string, int> RuleCmdLength;
+
   /// The set of dependencies to add to the "all" target.
   cmNinjaDeps AllDependencies;
 
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 01e8e737a..6befb051c 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -480,7 +480,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
 
   int cmdLineLimit;
 #ifdef _WIN32
-  cmdLineLimit = 8000;
+  cmdLineLimit = 8000 - this->GetGlobalGenerator()->
+                                 GetRuleCmdLength(this->LanguageLinkerRule());
 #else
   cmdLineLimit = -1; // TODO
 #endif