Swift/Ninja: Include sources in response file

Unlike C/C++, Swift compiles all sources in a module at once. This can
quickly overwhelm the commandline length limit on Windows, so it is
useful to place the source files in the response file.

Issue: #25572
stage/master/nightly/2024/01/12
Evan Wilde 2024-01-09 16:33:46 -08:00
parent 38234058ff
commit b767917ebb
No known key found for this signature in database
3 changed files with 14 additions and 6 deletions

View File

@ -848,6 +848,14 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang,
flags = cmStrCat(responseFlag, rule.RspFile);
vars.Defines = "";
vars.Includes = "";
// Swift consumes all source files in a module at once, which reaches
// command line length limits pretty quickly. Inject source files into the
// response file in this case as well.
if (lang == "Swift") {
rule.RspContent = cmStrCat(rule.RspContent, ' ', vars.Source);
vars.Source = "";
}
}
// Tell ninja dependency format so all deps can be loaded into a database
@ -1925,8 +1933,6 @@ void cmNinjaTargetGenerator::WriteSwiftObjectBuildStatement(
// For that, we need the "NEW" behavior for CMP0157. Otherwise, we have to
// fall back on the old "linker" build. Otherwise, this should be
// indistinguishable from the old behavior.
//
// FIXME(#25490): Add response file support to Swift object build step
if (sources.empty()) {
return;

View File

@ -48,6 +48,10 @@ std::string& cmPlaceholderExpander::ExpandVariables(std::string& s)
}
// add the rest of the input
expandedInput += s.substr(pos, s.size() - pos);
// remove trailing whitespace
if (!expandedInput.empty() && expandedInput.back() == ' ') {
expandedInput.pop_back();
}
s = expandedInput;
return s;

View File

@ -1,4 +1,2 @@
swiftc [^
]* -c @CMakeFiles/L.dir/L.o.swift.rsp [^
]*
.*swiftc -emit-library -static -o libL.a @CMakeFiles/L.rsp.*
swiftc -j [0-9]+ -num-threads [0-9]+ -c @CMakeFiles/L.dir/L.o.swift.rsp
.*swiftc -emit-library -static -o libL.a @CMakeFiles/L.rsp