Merge pull request ninja-build#59 from qhuo/multiple-outputs-fix

Multiple outputs fix: make $out include all outptus
okuoku · Jun 14, 2011 · b1ba559 · b1ba559
2 parents cf2f625 + edc4062
commit b1ba559
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/build_log_test.cc b/src/build_log_test.cc
@@ -21,6 +21,12 @@
 #include <share.h>
 #endif
 
+#ifdef linux
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#endif
+
 static const char kTestFilename[] = "BuildLogTest-tempfile";
 
 struct BuildLogTest : public StateTestWithBuiltinRules {

diff --git a/src/graph.cc b/src/graph.cc
@@ -105,7 +105,12 @@ struct EdgeEnv : public Env {
         result.append((*i)->file_->path_);
       }
     } else if (var == "out") {
-      result = edge_->outputs_[0]->file_->path_;
+      for (vector<Node*>::iterator i = edge_->outputs_.begin();
+           i != edge_->outputs_.end(); ++i) {
+        if (!result.empty())
+          result.push_back(' ');
+        result.append((*i)->file_->path_);
+      }
     } else if (edge_->env_) {
       return edge_->env_->LookupVariable(var);
     }