commit 0b5be1489acd5ab0f9d1e6d1734dc10ebbf77e0a
author Jan Niklas Hasse <jhasse@bixense.com> Mon Nov 02 17:02:40 2020 +0100
committer GitHub <noreply@github.com> Mon Nov 02 17:02:40 2020 +0100
tree 268729c017b304dbfe0b78605901a8de1b6aaa0a
parent d45ff8ebf88ef4add46a80ccdfc2d97a8b4b091b
parent b0b26cc9c43eb6a3ba728a8bfbcbceeb6dfcab20

Merge pull request #1834 from jhasse/close-during-generator

Close BuildLog while running generators, fix #1724

src/build.cc

diff --git a/src/build.cc b/src/build.cc
index e3131e2..2fb2aa4 100644
--- a/src/build.cc
+++ b/src/build.cc
@@ -828,6 +828,10 @@
     // See if we can start any more commands.
     if (failures_allowed && command_runner_->CanRunMore()) {
       if (Edge* edge = plan_.FindWork()) {
+        if (edge->GetBindingBool("generator")) {
+          scan_.build_log()->Close();
+        }
+
         if (!StartEdge(edge, err)) {
           Cleanup();
           status_->BuildFinished();

src/build_log.cc

diff --git a/src/build_log.cc b/src/build_log.cc
index 04409c8..4dcd6ce 100644
--- a/src/build_log.cc
+++ b/src/build_log.cc
@@ -183,7 +183,7 @@
 }
 
 bool BuildLog::OpenForWriteIfNeeded() {
-  if (log_file_path_.empty()) {
+  if (log_file_ || log_file_path_.empty()) {
     return true;
   }
   log_file_ = fopen(log_file_path_.c_str(), "ab");
@@ -204,7 +204,6 @@
       return false;
     }
   }
-  log_file_path_.clear();
   return true;
 }