diff options
author | Evan Martin <martine@danga.com> | 2012-04-26 03:13:10 (GMT) |
---|---|---|
committer | Evan Martin <martine@danga.com> | 2012-04-26 03:13:10 (GMT) |
commit | c2098f931b6d93b6eae406598e2b46c175bd969f (patch) | |
tree | bd6611e7b056b9a217de0b67fb7a3f1bcea62527 /src/clean.cc | |
parent | 5d6249fa8c3d6241f46701f43fd48db576714ae4 (diff) | |
parent | 3353e5508614598ff18592bda55f68a6223911cf (diff) | |
download | Ninja-c2098f931b6d93b6eae406598e2b46c175bd969f.zip Ninja-c2098f931b6d93b6eae406598e2b46c175bd969f.tar.gz Ninja-c2098f931b6d93b6eae406598e2b46c175bd969f.tar.bz2 |
Merge branch 'dont-clean-phony' of git://github.com/pcc/ninja
Conflicts:
src/clean.cc
Diffstat (limited to 'src/clean.cc')
-rw-r--r-- | src/clean.cc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/clean.cc b/src/clean.cc index c6a294f..3fe23ec 100644 --- a/src/clean.cc +++ b/src/clean.cc @@ -102,7 +102,7 @@ int Cleaner::CleanAll(bool generator) { for (vector<Edge*>::iterator e = state_->edges_.begin(); e != state_->edges_.end(); ++e) { // Do not try to remove phony targets - if ((*e)->rule_ == &State::kPhonyRule) + if ((*e)->is_phony()) continue; // Do not remove generator's files unless generator specified. if (!generator && (*e)->rule().generator()) @@ -123,14 +123,16 @@ int Cleaner::CleanAll(bool generator) { } void Cleaner::DoCleanTarget(Node* target) { - if (target->in_edge()) { - Remove(target->path()); - if (!target->in_edge()->rule().depfile().empty()) - Remove(target->in_edge()->EvaluateDepFile()); - if (target->in_edge()->HasRspFile()) - Remove(target->in_edge()->GetRspFile()); - for (vector<Node*>::iterator n = target->in_edge()->inputs_.begin(); - n != target->in_edge()->inputs_.end(); + if (Edge* e = target->in_edge()) { + // Do not try to remove phony targets + if (!e->is_phony()) { + Remove(target->path()); + if (!target->in_edge()->rule().depfile().empty()) + Remove(target->in_edge()->EvaluateDepFile()); + if (e->HasRspFile()) + Remove(e->GetRspFile()); + } + for (vector<Node*>::iterator n = e->inputs_.begin(); n != e->inputs_.end(); ++n) { DoCleanTarget(*n); } |