diff options
| author | Ryan Egesdahl <ryan.egesdahl@mongodb.com> | 2020-07-17 15:00:33 -0700 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-08-06 04:15:02 +0000 |
| commit | 535184a95e0f93fc18cfc449cb09b69418115c1c (patch) | |
| tree | effe3eab4a284e88b678732b26d26f1740614e22 /site_scons | |
| parent | 1fc20a5ec81db278996ab2a5e0f535b30134b5b9 (diff) | |
| download | mongo-535184a95e0f93fc18cfc449cb09b69418115c1c.tar.gz | |
SERVER-48041 Package santizer blacklist files in icecream environments
Before this point, remote builds did not work because Icecream did not
copy sanitizer blacklist files to the remote hosts. We had a check in
place that silently turned Icecream builds with sanitizers into local
builds. Now we build the sanitizer blacklist files into the environment
tarball that Icecream uses for remote builds.
(cherry picked from commit cdab099b95de7e2ea7aa9cf23ede566189a35756)
Diffstat (limited to 'site_scons')
| -rw-r--r-- | site_scons/site_tools/icecream.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/site_scons/site_tools/icecream.py b/site_scons/site_tools/icecream.py index 53cc5eb8ec4..6482c500c5a 100644 --- a/site_scons/site_tools/icecream.py +++ b/site_scons/site_tools/icecream.py @@ -130,15 +130,6 @@ def generate(env): env.get("ICECC_CREATE_ENV", "icecc-create-env") ) - # We can't handle sanitizer blacklist files, so disable icecc then, and just flow through - # icerun to prevent slamming the local system with a huge -j value. - if any( - f.startswith("-fsanitize-blacklist=") - for fs in ["CCFLAGS", "CFLAGS", "CXXFLAGS"] - for f in env[fs] - ): - env["ICECC"] = "$ICERUN" - # Make CC and CXX absolute paths too. It is better for icecc. env["CC"] = env.WhereIs("$CC") env["CXX"] = env.WhereIs("$CXX") |