avoid 2 Builder instance issues

- the first builder is used for bootstrapping, it is not useful to us, however the clean up may get running twice

Author: bobzhang

src/build.cc

@@ -191,8 +191,10 @@ void BuildStatus::BuildEdgeFinished(Edge* edge,
 #ifdef _WIN32
     _setmode(_fileno(stdout), _O_TEXT);  // End Windows extra CR fix
 #endif
-    fputs(stripped.c_str(),compiler_log);
-    fflush(compiler_log);
+    if (compiler_log) {
+      fputs(stripped.c_str(), compiler_log);
+      fflush(compiler_log);
+    }
   }
 }
 
@@ -751,15 +753,14 @@ bool RealCommandRunner::WaitForCommand(Result* result) {
 
 Builder::Builder(State* state, const BuildConfig& config,
                  BuildLog* build_log, DepsLog* deps_log,
-                 DiskInterface* disk_interface)
+                 DiskInterface* disk_interface,
+                 FILE* compiler_log)
     : state_(state), config_(config),
+      compiler_log_(compiler_log),
       plan_(this), disk_interface_(disk_interface),
       scan_(state, build_log, deps_log, disk_interface,
             &config_.depfile_parser_options) {
-  status_ = new BuildStatus(config);
-  compiler_log_ = fopen(".compiler.log","w");
-  setvbuf(compiler_log_,NULL,_IOLBF,BUFSIZ);
-  SetCloseOnExec(fileno(compiler_log_));
+  status_ = new BuildStatus(config);  
 }
 
 Builder::~Builder() {
@@ -794,9 +795,12 @@ void Builder::Cleanup() {
         disk_interface_->RemoveFile(depfile);
     }
   }
-  fputs("# Done",compiler_log_);
-  fclose(compiler_log_);
-  compiler_log_ = NULL;   
+
+  if (compiler_log_) {
+    fputs("# Done", compiler_log_);
+    fclose(compiler_log_);
+    compiler_log_ = NULL;
+  }
 }
 
 Node* Builder::AddTarget(const string& name, string* err) {

src/build.h

@@ -180,7 +180,7 @@ struct BuildConfig {
 struct Builder {
   Builder(State* state, const BuildConfig& config,
           BuildLog* build_log, DepsLog* deps_log,
-          DiskInterface* disk_interface);
+          DiskInterface* disk_interface, FILE* compiler_log);
   ~Builder();
 
   /// Clean up after interrupted commands by deleting output files.
@@ -214,8 +214,8 @@ struct Builder {
   bool LoadDyndeps(Node* node, string* err);
 
   State* state_;
-  FILE* compiler_log_;
   const BuildConfig& config_;
+  FILE* compiler_log_;
   Plan plan_;
 #if __cplusplus < 201703L
   auto_ptr<CommandRunner> command_runner_;

src/ninja.cc

@@ -251,7 +251,7 @@ bool NinjaMain::RebuildManifest(const char* input_file, string* err) {
   if (!node)
     return false;
 
-  Builder builder(&state_, config_, &build_log_, &deps_log_, &disk_interface_);
+  Builder builder(&state_, config_, &build_log_, &deps_log_, &disk_interface_, NULL);
   if (!builder.AddTarget(node, err))
     return false;
 
@@ -1131,7 +1131,11 @@ int NinjaMain::RunBuild(int argc, char** argv) {
 
   disk_interface_.AllowStatCache(g_experimental_statcache);
 
-  Builder builder(&state_, config_, &build_log_, &deps_log_, &disk_interface_);
+  FILE* compiler_log_ = fopen(".compiler.log","w");
+  setvbuf(compiler_log_,NULL,_IOLBF,BUFSIZ);
+  SetCloseOnExec(fileno(compiler_log_));
+  Builder builder(&state_, config_, &build_log_, &deps_log_, &disk_interface_,compiler_log_);
+  
   for (size_t i = 0; i < targets.size(); ++i) {
     if (!builder.AddTarget(targets[i], &err)) {
       if (!err.empty()) {
@@ -1363,7 +1367,7 @@ NORETURN void real_main(int argc, char** argv) {
     ninja.ToolCleanDead(&options,argc,argv);
 
     // Attempt to rebuild the manifest before building anything else
-    if (ninja.RebuildManifest(options.input_file, &err)) {
+    if (false && ninja.RebuildManifest(options.input_file, &err)) {
       // In dry_run mode the regeneration will succeed without changing the
       // manifest forever. Better to return immediately.
       if (config.dry_run)