diff options
| author | Maxim Kalaev <maximus.ka@gmail.com> | 2013-09-02 22:24:26 (GMT) |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2013-09-02 22:24:26 (GMT) |
| commit | d7a46654a7be1a46a777a8d8a51f065ac98ce05d (patch) | |
| tree | dddae66dc8b0a8358808493d4286b97e3f488a0d /src/build.cc | |
| parent | ddbf9a42b8a7a2d47e25f4af18f726d49f6f8a91 (diff) | |
| download | Ninja-d7a46654a7be1a46a777a8d8a51f065ac98ce05d.zip Ninja-d7a46654a7be1a46a777a8d8a51f065ac98ce05d.tar.gz Ninja-d7a46654a7be1a46a777a8d8a51f065ac98ce05d.tar.bz2 | |
Check depslog timestamp in LoadDepsFromLog(), not in RecomputeOutputDirty().
RecomputeOutputDirty() is called from two places:
1. RecomputeDirty(), which calls LoadDeps().
2. CleanNode(), which always passes 0 for the deps mtime.
So this is no behavior change in either case.
deps_mtime was nonzero only in deps mode, and it got passed all over the
place. This makes things simpler.
Diffstat (limited to 'src/build.cc')
| -rw-r--r-- | src/build.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/build.cc b/src/build.cc index 45f6849..73dc1ff 100644 --- a/src/build.cc +++ b/src/build.cc @@ -426,7 +426,7 @@ void Plan::CleanNode(DependencyScan* scan, Node* node) { bool dirty = false; for (vector<Node*>::iterator ni = (*ei)->outputs_.begin(); !dirty && ni != (*ei)->outputs_.end(); ++ni) { - dirty = scan->RecomputeOutputDirty(*ei, most_recent_input, 0, + dirty = scan->RecomputeOutputDirty(*ei, most_recent_input, command, *ni); } |