From 88016e2e9f13d60c4a0b88fb64ffd802a2d9e534 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Sun, 9 Oct 2016 10:34:48 +0200
Subject: cmLocalGenerator: Introduce a container of compiler names

Use it to determine when a rule replacement should gain extra options.
---
 Source/cmLocalGenerator.cxx | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 4f285cf..a9de948 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -691,6 +691,17 @@ std::string cmLocalGenerator::ExpandRuleVariable(
   }
   std::vector<std::string> enabledLanguages =
     this->GetState()->GetEnabledLanguages();
+
+  std::map<std::string, std::string> compilers;
+  for (std::vector<std::string>::iterator i = enabledLanguages.begin();
+       i != enabledLanguages.end(); ++i) {
+    std::string const& lang = *i;
+    if (lang == "NONE") {
+      continue;
+    }
+    compilers["CMAKE_" + lang + "_COMPILER"] = lang;
+  }
+
   // loop over language specific replace variables
   for (const char* const* replaceIter = cmArrayBegin(ruleReplaceVars);
        replaceIter != cmArrayEnd(ruleReplaceVars); ++replaceIter) {
@@ -707,9 +718,12 @@ std::string cmLocalGenerator::ExpandRuleVariable(
       const char* compilerOptionExternalToolchain = CM_NULLPTR;
       const char* compilerSysroot = CM_NULLPTR;
       const char* compilerOptionSysroot = CM_NULLPTR;
-      if (actualReplace == "CMAKE_${LANG}_COMPILER") {
-        std::string arg1 = actualReplace + "_ARG1";
-        cmSystemTools::ReplaceString(arg1, "${LANG}", lang);
+
+      std::map<std::string, std::string>::iterator compIt =
+        compilers.find(variable);
+
+      if (compIt != compilers.end()) {
+        std::string arg1 = compIt->first + "_ARG1";
         compilerArg1 = this->Makefile->GetDefinition(arg1);
         compilerTarget = this->Makefile->GetDefinition(
           std::string("CMAKE_") + lang + "_COMPILER_TARGET");
-- 
cgit v0.12