diff options
| author | Qingning Huo <qingninghuo@gmail.com> | 2011-09-06 19:46:32 (GMT) |
|---|---|---|
| committer | Qingning Huo <qingninghuo@gmail.com> | 2011-09-06 19:46:32 (GMT) |
| commit | 8efe599247c762caa6da54a1c10e37c538319669 (patch) | |
| tree | 9a159b956cbb35c85d966f026e0b63ad713c862f /src/graph.cc | |
| parent | e292718907a60c464dbe471ccdc7014731a4b6a2 (diff) | |
| download | Ninja-8efe599247c762caa6da54a1c10e37c538319669.zip Ninja-8efe599247c762caa6da54a1c10e37c538319669.tar.gz Ninja-8efe599247c762caa6da54a1c10e37c538319669.tar.bz2 | |
Add depfile support to build command with multiple outputs (Fixes: #61)
parsers.cpp: allow depfile used at build command with multiple outputs.
graph.cpp: allow depfile used at build command with multiple outputs.
parsers_test.cpp: make the test pass.
As before, the depfile itself can only mention one target, which must
be the first of a build command with multiple outpus.
[There is really no need to mention all the output in the depfile,
because all targets should depend on exactly the same files anyway,
because these targets are built by a single build command.]
Diffstat (limited to 'src/graph.cc')
| -rw-r--r-- | src/graph.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/graph.cc b/src/graph.cc index 9b5f10b..82716aa 100644 --- a/src/graph.cc +++ b/src/graph.cc @@ -150,10 +150,6 @@ bool Edge::LoadDepFile(State* state, DiskInterface* disk_interface, } // Check that this depfile matches our output. - if (outputs_.size() != 1) { - *err = "expected only one output"; - return false; - } if (outputs_[0]->file_->path_ != makefile.out_) { *err = "expected makefile to mention '" + outputs_[0]->file_->path_ + "', " "got '" + makefile.out_ + "'"; |