diff options
| author | Mathew Robinson <mathew@chasinglogic.io> | 2020-02-20 10:01:40 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-02-21 20:41:38 +0000 |
| commit | 0e079be3b4567fa462a1c3c5958ea1b36a9aad9e (patch) | |
| tree | ab172257abddc172c02dd8bc41e2a9e051d73fbc /SConstruct | |
| parent | 2b3b77f4b15540be640a08322c36f22f8273b01d (diff) | |
| download | mongo-0e079be3b4567fa462a1c3c5958ea1b36a9aad9e.tar.gz | |
SERVER-40943 Support fetching icecream toolchain tarballs from URLs in SCons
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 34cbe6d77c8..dcf77d4d603 100644 --- a/SConstruct +++ b/SConstruct @@ -758,7 +758,7 @@ env_vars.Add('ICERUN', env_vars.Add('ICECC_CREATE_ENV', help='Tell SCons where icecc-create-env tool is', - default='buildscripts/icecc_create_env') + default='icecc-create-env') env_vars.Add('ICECC_SCHEDULER', help='Tell ICECC where the sceduler daemon is running') @@ -3781,6 +3781,12 @@ env["NINJA_SYNTAX"] = "#site_scons/third_party/ninja_syntax.py" # icecream, if available. Per the rules declared in the icecream tool, # load the ccache tool first. env.Tool('ccache') + +if env.ToolchainIs("clang"): + env["ICECC_COMPILER_TYPE"] = "clang" +elif env.ToolchainIs("gcc"): + env["ICECC_COMPILER_TYPE"] = "gcc" + env.Tool('icecream') if get_option('ninja') != 'disabled': @@ -3865,7 +3871,6 @@ if get_option('ninja') != 'disabled': env.NinjaRegisterFunctionHandler("write_uuid_to_file", fakelib_in_ninja) - def ninja_test_list_builder(env, node): test_files = [test_file.path for test_file in env["MONGO_TEST_REGISTRY"][node.path]] files = "\\n".join(test_files) |