diff options
| author | Andrew Morrow <acm@mongodb.com> | 2020-08-17 19:20:56 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-08-18 17:21:36 +0000 |
| commit | 0662433ac038f4f3cf137a1be30ca245c180e990 (patch) | |
| tree | 79198ecb2f5570205279f6e47e4b5b158561d1fe /SConstruct | |
| parent | 697b791f6429c6aa9c6ff2cdb4ac1adbe5a2a32b (diff) | |
| download | mongo-0662433ac038f4f3cf137a1be30ca245c180e990.tar.gz | |
SERVER-47598 Refactor ICECC_VERSION handling
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 01a88b84669..774012cd33b 100644 --- a/SConstruct +++ b/SConstruct @@ -3841,8 +3841,11 @@ if env.ToolchainIs("clang"): elif env.ToolchainIs("gcc"): env["ICECC_COMPILER_TYPE"] = "gcc" -env.Tool('icecream') - +if get_option('build-tools') == 'next' or get_option('ninja') == 'next': + env['ICECREAM_TARGET_DIR'] = '$BUILD_ROOT/scons/icecream' + env.Tool('icecream', verbose=env.Verbose()) +else: + env.Tool('icecream') # Defaults for SCons provided flags. SetOption only sets the option to our value # if the user did not provide it. So for any flag here if it's explicitly passed |