summaryrefslogtreecommitdiffstats
path: root/src/ninja.cc
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2012-09-04 22:39:04 (GMT)
committerEvan Martin <martine@danga.com>2012-09-04 22:39:04 (GMT)
commit1e11c8a6bd119025efd8725370ffa42354f92f88 (patch)
tree53adfbd3d97d14a84bc9e0657e85569d0d547a11 /src/ninja.cc
parent703dcffd6d2e4b64411eb44d3025093abfd1d737 (diff)
downloadNinja-1e11c8a6bd119025efd8725370ffa42354f92f88.zip
Ninja-1e11c8a6bd119025efd8725370ffa42354f92f88.tar.gz
Ninja-1e11c8a6bd119025efd8725370ffa42354f92f88.tar.bz2
move BuildLog to DependencyScan
The build log is needed in computing whether an edge is dirty, so I think it belongs here. (It's a bit weird that Builder needs to reach into it to record completed commands, maybe it will become cleaner with more thought.)
Diffstat (limited to 'src/ninja.cc')
-rw-r--r--src/ninja.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ninja.cc b/src/ninja.cc
index 799af02..fb2bb3c 100644
--- a/src/ninja.cc
+++ b/src/ninja.cc
@@ -737,7 +737,6 @@ reload:
return RunTool(tool, &globals, argc, argv);
BuildLog build_log;
- globals.state->build_log_ = &build_log;
const string build_dir = globals.state->bindings_.LookupVariable("builddir");
const char* kLogPath = ".ninja_log";
@@ -770,7 +769,7 @@ reload:
if (!rebuilt_manifest) { // Don't get caught in an infinite loop by a rebuild
// target that is never up to date.
- Builder manifest_builder(globals.state, globals.config,
+ Builder manifest_builder(globals.state, globals.config, &build_log,
&globals.disk_interface);
if (RebuildManifest(&manifest_builder, input_file, &err)) {
rebuilt_manifest = true;
@@ -782,7 +781,8 @@ reload:
}
}
- Builder builder(globals.state, globals.config, &globals.disk_interface);
+ Builder builder(globals.state, globals.config, &build_log,
+ &globals.disk_interface);
int result = RunBuild(&builder, argc, argv);
if (g_metrics) {
g_metrics->Report();