|
@@ -1404,8 +1404,6 @@ void cmLocalGenerator::OutputLinkLibraries(
|
|
{
|
|
{
|
|
OutputFormat shellFormat =
|
|
OutputFormat shellFormat =
|
|
(forResponseFile) ? RESPONSE : ((useWatcomQuote) ? WATCOMQUOTE : SHELL);
|
|
(forResponseFile) ? RESPONSE : ((useWatcomQuote) ? WATCOMQUOTE : SHELL);
|
|
- bool escapeAllowMakeVars = !forResponseFile;
|
|
|
|
-
|
|
|
|
cmComputeLinkInformation& cli = *pcli;
|
|
cmComputeLinkInformation& cli = *pcli;
|
|
|
|
|
|
std::string linkLanguage = cli.GetLinkLanguage();
|
|
std::string linkLanguage = cli.GetLinkLanguage();
|
|
@@ -1457,7 +1455,7 @@ void cmLocalGenerator::OutputLinkLibraries(
|
|
std::string rpath_link = cli.GetRPathLinkString();
|
|
std::string rpath_link = cli.GetRPathLinkString();
|
|
if (!cli.GetRPathLinkFlag().empty() && !rpath_link.empty()) {
|
|
if (!cli.GetRPathLinkFlag().empty() && !rpath_link.empty()) {
|
|
fout << cli.GetRPathLinkFlag();
|
|
fout << cli.GetRPathLinkFlag();
|
|
- fout << this->EscapeForShell(rpath_link, escapeAllowMakeVars);
|
|
|
|
|
|
+ fout << this->EscapeForShell(rpath_link, !forResponseFile);
|
|
fout << " ";
|
|
fout << " ";
|
|
}
|
|
}
|
|
|
|
|