diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2014-06-27 20:07:54 (GMT) |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2014-06-27 20:07:54 (GMT) |
| commit | 6fa4beb8b991f7f22966df6c90ff776cac60c833 (patch) | |
| tree | 890dafa85ff682b7f606784a30287b38fab1a720 | |
| parent | 234e49931293c9df77cc696b40038827b34a0bbf (diff) | |
| parent | f6baa1b8e83efe007af3485f0595bec00f830a8f (diff) | |
| download | Ninja-6fa4beb8b991f7f22966df6c90ff776cac60c833.zip Ninja-6fa4beb8b991f7f22966df6c90ff776cac60c833.tar.gz Ninja-6fa4beb8b991f7f22966df6c90ff776cac60c833.tar.bz2 | |
Merge pull request #789 from nico/dontwin
Rename -d nowinstatcache to -d nostatcache; might become useful elsewhere (#787)
| -rw-r--r-- | src/debug_flags.cc | 2 | ||||
| -rw-r--r-- | src/debug_flags.h | 2 | ||||
| -rw-r--r-- | src/ninja.cc | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/debug_flags.cc b/src/debug_flags.cc index ccd4396..8065001 100644 --- a/src/debug_flags.cc +++ b/src/debug_flags.cc @@ -16,4 +16,4 @@ bool g_explaining = false; bool g_keep_rsp = false; -bool g_experimental_win_statcache = true; +bool g_experimental_statcache = true; diff --git a/src/debug_flags.h b/src/debug_flags.h index 4ffef75..7965585 100644 --- a/src/debug_flags.h +++ b/src/debug_flags.h @@ -26,6 +26,6 @@ extern bool g_explaining; extern bool g_keep_rsp; -extern bool g_experimental_win_statcache; +extern bool g_experimental_statcache; #endif // NINJA_EXPLAIN_H_ diff --git a/src/ninja.cc b/src/ninja.cc index 15e265b..a381e83 100644 --- a/src/ninja.cc +++ b/src/ninja.cc @@ -763,7 +763,7 @@ bool DebugEnable(const string& name) { " explain explain what caused a command to execute\n" " keeprsp don't delete @response files on success\n" #ifdef _WIN32 -" nowinstatcache don't batch stat() calls per directory and cache them\n" +" nostatcache don't batch stat() calls per directory and cache them\n" #endif "multiple modes can be enabled via -d FOO -d BAR\n"); return false; @@ -776,13 +776,13 @@ bool DebugEnable(const string& name) { } else if (name == "keeprsp") { g_keep_rsp = true; return true; - } else if (name == "nowinstatcache") { - g_experimental_win_statcache = false; + } else if (name == "nostatcache") { + g_experimental_statcache = false; return true; } else { const char* suggestion = SpellcheckString(name.c_str(), "stats", "explain", "keeprsp", - "nowinstatcache", NULL); + "nostatcache", NULL); if (suggestion) { Error("unknown debug setting '%s', did you mean '%s'?", name.c_str(), suggestion); @@ -891,7 +891,7 @@ int NinjaMain::RunBuild(int argc, char** argv) { return 1; } - disk_interface_.AllowStatCache(g_experimental_win_statcache); + disk_interface_.AllowStatCache(g_experimental_statcache); Builder builder(&state_, config_, &build_log_, &deps_log_, &disk_interface_); for (size_t i = 0; i < targets.size(); ++i) { |