Ninja: Use native slashes to pass rsp files

Some tools on Windows (e.g. Embarcadero linkers) can't handle forward
slashes in paths to rsp files.
This commit is contained in:
Matthijs Kool
2018-06-05 15:21:49 +02:00
committed by Brad King
parent 90ebc32d9e
commit 88365838b8

View File

@@ -719,9 +719,9 @@ void cmNinjaNormalTargetGenerator::WriteDeviceLinkStatement()
static_cast<int>(cmSystemTools::CalculateCommandLineLengthLimit()) -
globalGen.GetRuleCmdLength(this->LanguageLinkerDeviceRule());
const std::string rspfile =
const std::string rspfile = this->ConvertToNinjaPath(
std::string(cmake::GetCMakeFilesDirectoryPostSlash()) +
genTarget.GetName() + ".rsp";
genTarget.GetName() + ".rsp");
// Gather order-only dependencies.
cmNinjaDeps orderOnlyDeps;
@@ -1005,9 +1005,9 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
globalGen.GetRuleCmdLength(this->LanguageLinkerRule());
}
const std::string rspfile =
const std::string rspfile = this->ConvertToNinjaPath(
std::string(cmake::GetCMakeFilesDirectoryPostSlash()) + gt.GetName() +
".rsp";
".rsp");
// Gather order-only dependencies.
cmNinjaDeps orderOnlyDeps;