summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2016-10-08 10:21:38 (GMT)
committerStephen Kelly <steveire@gmail.com>2016-10-10 18:38:59 (GMT)
commit3444105f9fe4fcee390c8d616e1a211a078a630b (patch)
treeaa82b29c7417e45673a9ebe979e10d3dc7f63290
parent77c4202edc242c96087295585a85a20700bdb26f (diff)
downloadCMake-3444105f9fe4fcee390c8d616e1a211a078a630b.zip
CMake-3444105f9fe4fcee390c8d616e1a211a078a630b.tar.gz
CMake-3444105f9fe4fcee390c8d616e1a211a078a630b.tar.bz2
cmLocalGenerator: Inline last use of local variable
-rw-r--r--Source/cmLocalGenerator.cxx4
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 63c8aef..d41399a 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1404,8 +1404,6 @@ void cmLocalGenerator::OutputLinkLibraries(
{
OutputFormat shellFormat =
(forResponseFile) ? RESPONSE : ((useWatcomQuote) ? WATCOMQUOTE : SHELL);
- bool escapeAllowMakeVars = !forResponseFile;
-
cmComputeLinkInformation& cli = *pcli;
std::string linkLanguage = cli.GetLinkLanguage();
@@ -1457,7 +1455,7 @@ void cmLocalGenerator::OutputLinkLibraries(
std::string rpath_link = cli.GetRPathLinkString();
if (!cli.GetRPathLinkFlag().empty() && !rpath_link.empty()) {
fout << cli.GetRPathLinkFlag();
- fout << this->EscapeForShell(rpath_link, escapeAllowMakeVars);
+ fout << this->EscapeForShell(rpath_link, !forResponseFile);
fout << " ";
}