aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2021-03-19 09:52:50 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2021-03-19 09:52:50 +0200
commit14b8aa90926bdc7233caa926d81984c6593e1f76 (patch)
tree1476a5d48b2a9be2332b59a82004342bbc42edc9
parenta5cfd981acb3e91bed7bd30f7c1e2df88cc3629b (diff)
Temporarily default to noop file cache
-rw-r--r--build2/b.cxx6
-rw-r--r--libbuild2/file-cache.cxx2
2 files changed, 5 insertions, 3 deletions
diff --git a/build2/b.cxx b/build2/b.cxx
index 1ba15e2..93c02b4 100644
--- a/build2/b.cxx
+++ b/build2/b.cxx
@@ -763,13 +763,15 @@ main (int argc, char* argv[])
global_mutexes mutexes (sched.shard_size ());
- bool fcache_comp (true);
+ bool fcache_comp (false);
if (ops.file_cache_specified ())
{
const string& v (ops.file_cache ());
if (v == "noop" || v == "none")
fcache_comp = false;
- else if (v != "sync-lz4")
+ else if (v == "sync-lz4")
+ fcache_comp = true;
+ else
fail << "invalid --file-cache value '" << v << "'";
}
diff --git a/libbuild2/file-cache.cxx b/libbuild2/file-cache.cxx
index 95e9536..08fbe77 100644
--- a/libbuild2/file-cache.cxx
+++ b/libbuild2/file-cache.cxx
@@ -19,7 +19,7 @@ namespace build2
{
assert (state_ == uninit);
- // Remove stale compressed file if exists. While not strictly necessary
+ // Remove stale compressed file if it exists. While not strictly necessary
// (since the presence of the new uncompressed file will render the
// compressed one invalid), this makes things cleaner in case we don't get
// to compressing the new file (for example, if we fail and leave the