diff options
| author | Evan Martin <martine@danga.com> | 2012-09-02 19:53:59 (GMT) |
|---|---|---|
| committer | Evan Martin <martine@danga.com> | 2012-09-02 19:56:08 (GMT) |
| commit | 4d9bf949e0fd6976725dea12bcc254fd39da6490 (patch) | |
| tree | 3b255fabddbdece75019d522d14c97532610466e /src/ninja.cc | |
| parent | 3220e626da48bc0fd69bee5a3dfae3b55bd0b761 (diff) | |
| download | Ninja-4d9bf949e0fd6976725dea12bcc254fd39da6490.zip Ninja-4d9bf949e0fd6976725dea12bcc254fd39da6490.tar.gz Ninja-4d9bf949e0fd6976725dea12bcc254fd39da6490.tar.bz2 | |
remove config from BuildLog, rename members
Diffstat (limited to 'src/ninja.cc')
| -rw-r--r-- | src/ninja.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/ninja.cc b/src/ninja.cc index 19438e5..13c0592 100644 --- a/src/ninja.cc +++ b/src/ninja.cc @@ -740,7 +740,6 @@ reload: return RunTool(tool, &globals, argc, argv); BuildLog build_log; - build_log.SetConfig(&globals.config); globals.state->build_log_ = &build_log; const string build_dir = globals.state->bindings_.LookupVariable("builddir"); @@ -765,9 +764,11 @@ reload: err.clear(); } - if (!build_log.OpenForWrite(log_path, &err)) { - Error("opening build log: %s", err.c_str()); - return 1; + if (!globals.config.dry_run) { + if (!build_log.OpenForWrite(log_path, &err)) { + Error("opening build log: %s", err.c_str()); + return 1; + } } if (!rebuilt_manifest) { // Don't get caught in an infinite loop by a rebuild |