diff options
| author | Evan Martin <martine@danga.com> | 2012-10-27 20:09:40 (GMT) |
|---|---|---|
| committer | Evan Martin <martine@danga.com> | 2012-12-29 20:34:25 (GMT) |
| commit | 13dd08c1a03e5a8f4299816fbd3af1b6cb6d9642 (patch) | |
| tree | 9564593d47936d2e47d88e344c2f6915ba8753a3 /src/clean.cc | |
| parent | 3249938cdf574058a066436aea06b0541ded6958 (diff) | |
| download | Ninja-13dd08c1a03e5a8f4299816fbd3af1b6cb6d9642.zip Ninja-13dd08c1a03e5a8f4299816fbd3af1b6cb6d9642.tar.gz Ninja-13dd08c1a03e5a8f4299816fbd3af1b6cb6d9642.tar.bz2 | |
rearrange handling of builtin bindings to make rules simpler
Now, a 'build' block can override any special binding like 'command'
or 'description' if it needs to.
Diffstat (limited to 'src/clean.cc')
| -rw-r--r-- | src/clean.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/clean.cc b/src/clean.cc index 0b8476b..12afb98 100644 --- a/src/clean.cc +++ b/src/clean.cc @@ -83,11 +83,11 @@ bool Cleaner::IsAlreadyRemoved(const string& path) { } void Cleaner::RemoveEdgeFiles(Edge* edge) { - string depfile = edge->EvaluateDepFile(); + string depfile = edge->GetBinding("depfile"); if (!depfile.empty()) Remove(depfile); - string rspfile = edge->GetRspFile(); + string rspfile = edge->GetBinding("rspfile"); if (!rspfile.empty()) Remove(rspfile); } @@ -117,7 +117,7 @@ int Cleaner::CleanAll(bool generator) { if ((*e)->is_phony()) continue; // Do not remove generator's files unless generator specified. - if (!generator && (*e)->rule().generator()) + if (!generator && (*e)->GetBindingBool("generator")) continue; for (vector<Node*>::iterator out_node = (*e)->outputs_.begin(); out_node != (*e)->outputs_.end(); ++out_node) { |