diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2012-03-05 01:35:44 (GMT) |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2012-03-05 01:53:54 (GMT) |
| commit | b70b3ad28279e9d8a56d3f52c2057978a81f65f1 (patch) | |
| tree | 0c9f76d9e1fdf3cdbedc0ad0a45b863bfc064583 /src/graph.cc | |
| parent | 2338d9340bb2c13746805b4b878c889008850962 (diff) | |
| download | Ninja-b70b3ad28279e9d8a56d3f52c2057978a81f65f1.zip Ninja-b70b3ad28279e9d8a56d3f52c2057978a81f65f1.tar.gz Ninja-b70b3ad28279e9d8a56d3f52c2057978a81f65f1.tar.bz2 | |
Mark a phony target with no inputs as outputs-ready
Even if such a target is dirty (i.e. the file does not exist), it
has nothing to do, which makes it safe to mark as outputs-ready.
Without this change, ninja will print no output when rebuilding the
target (or an order-only dependency thereof), instead of reporting
it has "no work to do".
Diffstat (limited to 'src/graph.cc')
| -rw-r--r-- | src/graph.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/graph.cc b/src/graph.cc index e2f966c..9d45ce1 100644 --- a/src/graph.cc +++ b/src/graph.cc @@ -96,10 +96,10 @@ bool Edge::RecomputeDirty(State* state, DiskInterface* disk_interface, (*i)->MarkDirty(); } - // If we're dirty, our outputs are not ready. (It's possible to be - // clean but still have not be ready in the presence of order-only - // inputs.) - if (dirty) + // If we're dirty, our outputs are normally not ready. (It's possible to be + // clean but still not be ready in the presence of order-only inputs.) + // But phony edges with no inputs have nothing to do, so are always ready. + if (dirty && !(is_phony() && inputs_.empty())) outputs_ready_ = false; return true; |