diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2013-07-20 04:47:00 (GMT) |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2013-07-20 04:47:00 (GMT) |
| commit | 3f605a8504cfc5fc5cd2bfae50d45f9d3d34d824 (patch) | |
| tree | 6e88e2d40fac1df7352598a20cecf4aa5a951114 /src/build.cc | |
| parent | 9bb715e1496572681815fad0142b32236cf6e987 (diff) | |
| parent | d864d8446ce465781127294f6f2d5efa86645967 (diff) | |
| download | Ninja-3f605a8504cfc5fc5cd2bfae50d45f9d3d34d824.zip Ninja-3f605a8504cfc5fc5cd2bfae50d45f9d3d34d824.tar.gz Ninja-3f605a8504cfc5fc5cd2bfae50d45f9d3d34d824.tar.bz2 | |
Merge pull request #624 from nico/landmaxim
Land the first two commits of pull request #608.
Diffstat (limited to 'src/build.cc')
| -rw-r--r-- | src/build.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/build.cc b/src/build.cc index 5cf9d27..2fbfdec 100644 --- a/src/build.cc +++ b/src/build.cc @@ -431,14 +431,13 @@ void Plan::CleanNode(DependencyScan* scan, Node* node) { if (scan->RecomputeOutputDirty(*ei, most_recent_input, 0, command, *ni)) { - (*ni)->MarkDirty(); all_outputs_clean = false; } else { CleanNode(scan, *ni); } } - // If we cleaned all outputs, mark the node as not wanted. + // If we cleaned all outputs, mark the edge as not wanted. if (all_outputs_clean) { want_i->second = false; --wanted_edges_; @@ -763,7 +762,7 @@ void Builder::FinishCommand(CommandRunner::Result* result) { } string depfile = edge->GetBinding("depfile"); - if (restat_mtime != 0 && !depfile.empty()) { + if (restat_mtime != 0 && deps_type.empty() && !depfile.empty()) { TimeStamp depfile_mtime = disk_interface_->Stat(depfile); if (depfile_mtime > restat_mtime) restat_mtime = depfile_mtime; |