diff options
| author | Ryan Egesdahl <ryan.egesdahl@mongodb.com> | 2020-07-17 14:05:36 -0700 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-07-17 21:20:27 +0000 |
| commit | 4635320ea16bb9217605b7150461561fdded5e22 (patch) | |
| tree | d05c4149e8688a71e68cb7d272f43bf0adff8291 /SConstruct | |
| parent | 2a4a2def40803f7dbdfa3ec21f0c178a5a16e259 (diff) | |
| download | mongo-4635320ea16bb9217605b7150461561fdded5e22.tar.gz | |
Revert "SERVER-48443 Fix builds with Icecream 1.2+ and gcc 4.4+"
This reverts commit 01dd381f3359c44bbc9338d91371d1ff823bb7d8.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index 0f47acf5684..b83097f8547 100644 --- a/SConstruct +++ b/SConstruct @@ -3809,10 +3809,9 @@ def doConfigure(myenv): env = doConfigure( env ) env["NINJA_SYNTAX"] = "#site_scons/third_party/ninja_syntax.py" - # Now that we are done with configure checks, enable ccache and -# icecream if requested. If *both* icecream and ccache are requested, -# ccache must be loaded first. +# icecream, if available. Per the rules declared in the icecream tool, +# load the ccache tool first. env.Tool('ccache') if env.ToolchainIs("clang"): @@ -3822,7 +3821,6 @@ elif env.ToolchainIs("gcc"): 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 # the values below set with SetOption will be overwritten. |