diff options
| author | Andrew Morrow <acm@mongodb.com> | 2016-09-05 16:01:14 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2016-10-20 16:55:43 -0400 |
| commit | f6e1dfb14413f4de88d236b50047c3b69ad5473c (patch) | |
| tree | 32d73b447ad77a601836a6c3ff0c436549cc1a27 /SConstruct | |
| parent | 81ea77ca8305f6a8783ba29e1a93cafa6be81a50 (diff) | |
| download | mongo-f6e1dfb14413f4de88d236b50047c3b69ad5473c.tar.gz | |
SERVER-26472 Allow fast and loose to be combined with the cache if explicitly requested
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/SConstruct b/SConstruct index f4a01cc284f..33ced31445a 100644 --- a/SConstruct +++ b/SConstruct @@ -395,10 +395,10 @@ add_option('use-cpu-profiler', ) add_option('build-fast-and-loose', - choices=['on', 'off'], + choices=['on', 'off', 'auto'], const='on', - default='on', - help='looser dependency checking, ignored for --release builds', + default='auto', + help='looser dependency checking', nargs='?', type='choice', ) @@ -1290,10 +1290,12 @@ if link_model.startswith("dynamic"): if optBuild: env.SetConfigHeaderDefine("MONGO_CONFIG_OPTIMIZED_BUILD") -# Ignore requests to build fast and loose for release builds. -# Also ignore fast-and-loose option if the scons cache is enabled (see SERVER-19088) -if get_option('build-fast-and-loose') == "on" and \ - not has_option('release') and not has_option('cache'): +# Enable the fast decider if exlicltly requested or if in 'auto' mode and not in conflict with other +# options. +if get_option('build-fast-and-loose') == 'on' or \ + (get_option('build-fast-and-loose') == 'auto' and \ + not has_option('release') and \ + not has_option('cache')): # See http://www.scons.org/wiki/GoFastButton for details env.Decider('MD5-timestamp') env.SetOption('max_drift', 1) |