From 6cd27a853a1c77e5da0a9a14140284a7674cf18c Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sun, 9 Oct 2016 10:34:48 +0200 Subject: cmLocalGenerator: Move variable to where it can be used easily --- Source/cmLocalGenerator.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index c405180..03f5d2c 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -722,6 +722,8 @@ std::string cmLocalGenerator::ExpandRuleVariable( std::map::iterator compIt = compilers.find(variable); + std::string replace = this->Makefile->GetSafeDefinition(variable); + if (compIt != compilers.end()) { std::string arg1 = compIt->first + "_ARG1"; compilerArg1 = this->Makefile->GetDefinition(arg1); @@ -743,7 +745,6 @@ std::string cmLocalGenerator::ExpandRuleVariable( cmSystemTools::ReplaceString(actualReplace, "${LANG}", lang); } if (actualReplace == variable) { - std::string replace = this->Makefile->GetSafeDefinition(variable); // if the variable is not a FLAG then treat it like a path if (variable.find("_FLAG") == variable.npos) { std::string ret = this->ConvertToOutputForExisting(replace); -- cgit v0.12