summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authorAndrew Morrow <acm@mongodb.com>2021-04-21 10:37:29 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-04-21 16:08:19 +0000
commitded506addbb8e3821eb84604bd5c4a7458cabb45 (patch)
tree7a879b85bc6c66f500bc69e805b8c9c2d4cd2983 /buildscripts
parent8fb6d24818d09c45d88d7b459f4fe3dbf7db76f9 (diff)
downloadmongo-ded506addbb8e3821eb84604bd5c4a7458cabb45.tar.gz
Revert "SERVER-54732 turn on validate cachedir globally."
This reverts commit ff3841b180f7090f779874e96c37fe10ac6bd16f.
Diffstat (limited to 'buildscripts')
-rwxr-xr-xbuildscripts/generate_compile_expansions.py5
-rwxr-xr-xbuildscripts/generate_compile_expansions_shared_cache.py10
2 files changed, 6 insertions, 9 deletions
diff --git a/buildscripts/generate_compile_expansions.py b/buildscripts/generate_compile_expansions.py
index d29777f9d35..cd3b7c63b0c 100755
--- a/buildscripts/generate_compile_expansions.py
+++ b/buildscripts/generate_compile_expansions.py
@@ -95,9 +95,8 @@ def generate_scons_cache_expansions():
scons_cache_mode = "nolinked"
if os.getenv("USE_SCONS_CACHE") not in (None, False, "false", ""):
- expansions[
- "scons_cache_args"] = "--cache={0} --cache-signature-mode=validate --cache-dir={1}".format(
- scons_cache_mode, shlex.quote(default_cache_path))
+ expansions["scons_cache_args"] = "--cache={0} --cache-dir={1}".format(
+ scons_cache_mode, shlex.quote(default_cache_path))
return expansions
diff --git a/buildscripts/generate_compile_expansions_shared_cache.py b/buildscripts/generate_compile_expansions_shared_cache.py
index 337e9669c0f..4f31341c806 100755
--- a/buildscripts/generate_compile_expansions_shared_cache.py
+++ b/buildscripts/generate_compile_expansions_shared_cache.py
@@ -100,9 +100,8 @@ def generate_scons_cache_expansions():
shared_mount_root = '/efs'
default_cache_path = os.path.join(shared_mount_root, system_uuid, "scons-cache")
expansions["scons_cache_path"] = default_cache_path
- expansions[
- "scons_cache_args"] = "--cache={0} --cache-signature-mode=validate --cache-dir={1}".format(
- scons_cache_mode, shlex.quote(default_cache_path))
+ expansions["scons_cache_args"] = "--cache={0} --cache-dir={1}".format(
+ scons_cache_mode, shlex.quote(default_cache_path))
# Local shared cache - host-based
elif os.getenv("SCONS_CACHE_SCOPE") == "local":
@@ -114,9 +113,8 @@ def generate_scons_cache_expansions():
default_cache_path = os.path.join(default_cache_path_base, system_uuid)
expansions["scons_cache_path"] = default_cache_path
- expansions[
- "scons_cache_args"] = "--cache={0} --cache-signature-mode=validate --cache-dir={1}".format(
- scons_cache_mode, shlex.quote(default_cache_path))
+ expansions["scons_cache_args"] = "--cache={0} --cache-dir={1}".format(
+ scons_cache_mode, shlex.quote(default_cache_path))
# No cache
else:
# Anything else is 'none'