From 51f7dcb0a55874e71e4695f5154548a41c87ad56 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Sat, 27 Aug 2016 13:44:54 +0200
Subject: Makefiles: Inline MakeLauncher into only caller

---
 Source/cmLocalUnixMakefileGenerator3.cxx | 59 +++++++++++++++-----------------
 Source/cmLocalUnixMakefileGenerator3.h   |  3 --
 2 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 53c2ff6..53c9aa1 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -976,9 +976,33 @@ void cmLocalUnixMakefileGenerator3::AppendCustomCommand(
         // without the current directory being in the search path.
         cmd = "./" + cmd;
       }
-      std::string launcher = this->MakeLauncher(
-        ccg, target, workingDir.empty() ? cmOutputConverter::START_OUTPUT
-                                        : cmOutputConverter::NONE);
+
+      std::string launcher;
+      // Short-circuit if there is no launcher.
+      const char* prop = "RULE_LAUNCH_CUSTOM";
+      const char* val = this->GetRuleLauncher(target, prop);
+      if (val && *val) {
+        // Expand rules in the empty string.  It may insert the launcher and
+        // perform replacements.
+        RuleVariables vars;
+        vars.RuleLauncher = prop;
+        vars.CMTarget = target;
+        std::string output;
+        const std::vector<std::string>& outputs = ccg.GetOutputs();
+        if (!outputs.empty()) {
+          output = this->Convert(outputs[0], workingDir.empty()
+                                   ? cmOutputConverter::START_OUTPUT
+                                   : cmOutputConverter::NONE,
+                                 cmOutputConverter::SHELL);
+        }
+        vars.Output = output.c_str();
+
+        this->ExpandRuleVariables(launcher, vars);
+        if (!launcher.empty()) {
+          launcher += " ";
+        }
+      }
+
       std::string shellCommand = this->MaybeConvertWatcomShellCommand(cmd);
       if (shellCommand.empty()) {
         shellCommand = this->Convert(cmd, cmOutputConverter::NONE,
@@ -1027,35 +1051,6 @@ void cmLocalUnixMakefileGenerator3::AppendCustomCommand(
   commands.insert(commands.end(), commands1.begin(), commands1.end());
 }
 
-std::string cmLocalUnixMakefileGenerator3::MakeLauncher(
-  cmCustomCommandGenerator const& ccg, cmGeneratorTarget* target,
-  cmOutputConverter::RelativeRoot relative)
-{
-  std::string launcher;
-  // Short-circuit if there is no launcher.
-  const char* prop = "RULE_LAUNCH_CUSTOM";
-  const char* val = this->GetRuleLauncher(target, prop);
-  if (val && *val) {
-    // Expand rules in the empty string.  It may insert the launcher and
-    // perform replacements.
-    RuleVariables vars;
-    vars.RuleLauncher = prop;
-    vars.CMTarget = target;
-    std::string output;
-    const std::vector<std::string>& outputs = ccg.GetOutputs();
-    if (!outputs.empty()) {
-      output = this->Convert(outputs[0], relative, cmOutputConverter::SHELL);
-    }
-    vars.Output = output.c_str();
-
-    this->ExpandRuleVariables(launcher, vars);
-    if (!launcher.empty()) {
-      launcher += " ";
-    }
-  }
-  return launcher;
-}
-
 void cmLocalUnixMakefileGenerator3::AppendCleanCommand(
   std::vector<std::string>& commands, const std::vector<std::string>& files,
   cmGeneratorTarget* target, const char* filename)
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index ea98607..3e90055 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -251,9 +251,6 @@ protected:
 
 private:
   std::string MaybeConvertWatcomShellCommand(std::string const& cmd);
-  std::string MakeLauncher(cmCustomCommandGenerator const& ccg,
-                           cmGeneratorTarget* target,
-                           cmOutputConverter::RelativeRoot relative);
 
   void ComputeObjectFilenames(
     std::map<cmSourceFile const*, std::string>& mapping,
-- 
cgit v0.12