feat(incremental): rebuild when an #included header changes
The staleness check compared an artifact against its own source and its module imports. Headers were in neither set: the scanner reads `import` lines, and a .cppm or .cpp keeps its mtime when a header it includes is edited — so the build reported nothing to do and left objects compiled against the previous contents. Same silent mixed-layout binary as issue 27, reached through #include instead of import. Ask the compiler what it actually opened. Every C++ and C compile now passes -MD -MF <artifact>.d, and Check reads that depfile back through NewestPrerequisite, comparing every prerequisite's mtime against the artifact. A missing depfile (an object from a crafter-build that wrote none) or a prerequisite that no longer exists reads as "rebuild": neither is evidence of freshness. The parser unescapes make syntax rather than splitting on whitespace, since clang wraps depfiles onto continuation lines and escapes spaces in filenames.
This commit is contained in:
parent
672aabf215
commit
1d0d8e1e28
6 changed files with 111 additions and 8 deletions
|
|
@ -15,7 +15,10 @@ namespace Crafter {
|
|||
bool Implementation::Check(const fs::path& buildDir, const fs::path& pcmDir, fs::file_time_type sourceFloor) const {
|
||||
std::string objPath = std::format("{}_impl.o", (buildDir/path.filename()).string());
|
||||
std::string cppPath = std::format("{}.cpp", path.string());
|
||||
if(!fs::exists(objPath) || std::max(fs::last_write_time(cppPath), sourceFloor) >= fs::last_write_time(objPath)) {
|
||||
// The depfile clang wrote beside the object lists the headers this TU
|
||||
// included; nothing else in the configuration knows about them, since
|
||||
// the source scanner only reads `import` lines.
|
||||
if(!fs::exists(objPath) || std::max({fs::last_write_time(cppPath), sourceFloor, NewestPrerequisite(std::format("{}.d", objPath))}) >= fs::last_write_time(objPath)) {
|
||||
return true;
|
||||
}
|
||||
fs::file_time_type objTime = fs::last_write_time(objPath);
|
||||
|
|
@ -48,7 +51,8 @@ namespace Crafter {
|
|||
return;
|
||||
}
|
||||
|
||||
std::string result = RunCommand(std::format("{} {}.cpp -c -o {}_impl.o", clang, path.string(), (buildDir/path.filename()).string()));
|
||||
// -MD leaves <name>_impl.o.d beside the object for Check to read.
|
||||
std::string result = RunCommand(std::format("{0} {1}.cpp -c -MD -MF {2}_impl.o.d -o {2}_impl.o", clang, path.string(), (buildDir/path.filename()).string()));
|
||||
|
||||
bool expected = false;
|
||||
if(!result.empty() && buildCancelled.compare_exchange_strong(expected, true)) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue