diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-08-06 15:02:22 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-08-06 15:02:22 +0200 |
| commit | c20c3ad3141d88003245c6c7608e1f75c620e866 (patch) | |
| tree | 25145cefdca1a5d535ccc963ca92c93a6c6a2cfb | |
| parent | 4a853594b0a27dca6576c64d7bb8e6f9340b066f (diff) | |
Fix preprocessing/header generation race
| -rw-r--r-- | build2/cc/compile.cxx | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/build2/cc/compile.cxx b/build2/cc/compile.cxx index 9fae3c6..21fa4b7 100644 --- a/build2/cc/compile.cxx +++ b/build2/cc/compile.cxx @@ -1933,9 +1933,9 @@ namespace build2 // auto add = [&trace, &pfx_map, &so_map, act, &t, li, - &dd, &updating, mt, + &dd, &updating, &bs, this] - (path f, bool cache) -> bool + (path f, bool cache, timestamp mt) -> bool { // Find or maybe insert the target. The directory is only moved // from if insert is true. @@ -2158,12 +2158,7 @@ namespace build2 // Update. // - // If this header came from the depdb, make sure it is no older than - // the target (if it has changed since the target was updated, then - // the cached data is stale). - // - bool restart ( - update (trace, act, *pt, cache ? mt : timestamp_unknown)); + bool restart (update (trace, act, *pt, mt)); updating = updating || restart; @@ -2228,7 +2223,11 @@ namespace build2 : make_pair (auto_rmfile (), false); } - restart = add (path (move (*l)), true); + // If this header came from the depdb, make sure it is no older + // than the target (if it has changed since the target was + // updated, then the cached data is stale). + // + restart = add (path (move (*l)), true, mt); skip_count++; if (restart) @@ -2260,6 +2259,12 @@ namespace build2 // puse = true; + // Save the timestamp just before we start preprocessing. If + // we depend on any header that has been updated since, then + // we should assume we've "seen" the old copy and re-process. + // + timestamp pmt (system_clock::now ()); + // If we have no generated header support, then suppress all // diagnostics (if things go badly we will restart with this // support). @@ -2386,7 +2391,7 @@ namespace build2 } else { - restart = add (path (move (f)), false); + restart = add (path (move (f)), false, pmt); skip_count++; // If the header does not exist (good_error) then restart @@ -2457,7 +2462,7 @@ namespace build2 continue; } - restart = add (path (move (f)), false); + restart = add (path (move (f)), false, pmt); skip_count++; if (restart) |