From 93e0cfbd8f3912f5a280d20bd4a800d427644724 Mon Sep 17 00:00:00 2001
From: Brian Smith <brian@briansmith.org>
Date: Wed, 28 Jan 2015 04:21:56 -0800
Subject: [PATCH] Ninja: Pass only the flags relevant to the language.

This fixes http://www.cmake.org/Bug/view.php?id=15253 by only adding
$FLAGS for C, C++, and RC compilations, and only adding /showIncludes
for C/C++ compilations.
---
 Source/cmNinjaTargetGenerator.cxx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 67824c6..c440bbf 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -399,15 +399,20 @@ cmNinjaTargetGenerator
                           : mf->GetSafeDefinition("CMAKE_CXX_SIMULATE_ID");
   const bool usingMSVC = (cId == "MSVC" || sId == "MSVC");
 
   // Tell ninja dependency format so all deps can be loaded into a database
   std::string deptype;
   std::string depfile;
   std::string cldeps;
-  std::string flags = "$FLAGS";
+  std::string flags;
+  
+  if (lang == "C" || lang == "CXX" || lang == "RC")
+    {
+    flags += "$FLAGS";
+    }
   if (usingMSVC)
     {
     if (!mf->GetIsSourceFileTryCompile() && lang == "RC")
       {
       deptype = "gcc";
       depfile = "$DEP_FILE";
       const std::string cl = mf->GetDefinition("CMAKE_C_COMPILER") ?
@@ -419,15 +424,18 @@ cmNinjaTargetGenerator
       cldeps += mf->GetSafeDefinition("CMAKE_CL_SHOWINCLUDES_PREFIX");
       cldeps += "\" \"" + cl + "\" ";
       }
     else
       {
       deptype = "msvc";
       depfile = "";
-      flags += " /showIncludes";
+      if (lang == "C" || lang == "CXX")
+        {
+        flags += " /showIncludes";
+        }
       }
     }
   else
     {
     deptype = "gcc";
     const char* langdeptype = mf->GetDefinition("CMAKE_NINJA_DEPTYPE_" + lang);
     if (langdeptype)
-- 
1.9.5.github.0