diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2013-08-22 23:16:23 (GMT) |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2013-08-22 23:16:23 (GMT) |
| commit | ee1311979d98fd865aabfce03f55035866c3e2fb (patch) | |
| tree | c7e7cf405df3909046cd136639e7ef59b0d3a74d | |
| parent | 40b51a0b986b8675e15b0cd1b10c272bf51fdb84 (diff) | |
| parent | 9e9102a8b84ffea87e2afc97c8fd1981e8742274 (diff) | |
| download | Ninja-ee1311979d98fd865aabfce03f55035866c3e2fb.zip Ninja-ee1311979d98fd865aabfce03f55035866c3e2fb.tar.gz Ninja-ee1311979d98fd865aabfce03f55035866c3e2fb.tar.bz2 | |
Merge pull request #639 from rgeary1/StatusMessageFix
Fix for #638 incorrect number of total edges in the status message
| -rw-r--r-- | src/build.cc | 5 | ||||
| -rw-r--r-- | src/build.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/build.cc b/src/build.cc index 6d23f3b..45f6849 100644 --- a/src/build.cc +++ b/src/build.cc @@ -362,11 +362,8 @@ void Plan::ResumeDelayedJobs(Edge* edge) { void Plan::EdgeFinished(Edge* edge) { map<Edge*, bool>::iterator i = want_.find(edge); assert(i != want_.end()); - if (i->second) { + if (i->second) --wanted_edges_; - if (!edge->is_phony()) - --command_edges_; - } want_.erase(i); edge->outputs_ready_ = true; diff --git a/src/build.h b/src/build.h index a872f6c..aa96512 100644 --- a/src/build.h +++ b/src/build.h @@ -51,7 +51,7 @@ struct Plan { Edge* FindWork(); /// Returns true if there's more work to be done. - bool more_to_do() const { return (command_edges_ > 0); } + bool more_to_do() const { return (wanted_edges_ > 0) && (command_edges_ > 0); } /// Dumps the current state of the plan. void Dump(); |