diff options
Diffstat (limited to 'ninja/src/build.h')
| -rw-r--r-- | ninja/src/build.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ninja/src/build.h b/ninja/src/build.h index a872f6cf282..eb3636a9f3f 100644 --- a/ninja/src/build.h +++ b/ninja/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(); @@ -180,8 +180,9 @@ struct Builder { BuildStatus* status_; private: - bool ExtractDeps(CommandRunner::Result* result, const string& deps_type, - vector<Node*>* deps_nodes, string* err); + bool ExtractDeps(CommandRunner::Result* result, const string& deps_type, + const string& deps_prefix, vector<Node*>* deps_nodes, + string* err); DiskInterface* disk_interface_; DependencyScan scan_; |