diff options
| author | Andrew Morrow <acm@mongodb.com> | 2021-09-15 16:19:08 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-09-16 15:58:26 +0000 |
| commit | b14155d5714315ad771ba9bf07a7aae34a2f4405 (patch) | |
| tree | 46ed0f1027ff550bdb92387b948c91b521c411ee | |
| parent | 2d7b970b51dea751dd371838260f591bbf0eb3c0 (diff) | |
| download | mongo-b14155d5714315ad771ba9bf07a7aae34a2f4405.tar.gz | |
SERVER-59233 Suppress some warnings in third-party code or its use
| -rw-r--r-- | etc/evergreen.yml | 2 | ||||
| -rw-r--r-- | src/mongo/scripting/SConscript | 9 | ||||
| -rw-r--r-- | src/mongo/shell/SConscript | 9 | ||||
| -rw-r--r-- | src/third_party/benchmark/SConscript | 9 |
4 files changed, 27 insertions, 2 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index db0ee5e2a86..6db0ab5bbed 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -7867,7 +7867,7 @@ buildvariants: display_name: "~ Shared Library Enterprise Ubuntu 21.04 clang12 DEBUG" expansions: <<: *enterprise-ubuntu2104-dynamic-gcc11-debug-experimental-expansions - compile_flags: --dbg=on --opt=on -j$(grep -c ^processor /proc/cpuinfo) --link-model=dynamic CC=/usr/bin/clang-12 CXX=/usr/bin/clang++-12 --disable-warnings-as-errors + compile_flags: --dbg=on --opt=on -j$(grep -c ^processor /proc/cpuinfo) --link-model=dynamic CC=/usr/bin/clang-12 CXX=/usr/bin/clang++-12 - <<: *enterprise-ubuntu2104-dynamic-gcc11-debug-experimental-template name: enterprise-ubuntu2104-dynamic-gcc11-cxx20-debug-experimental diff --git a/src/mongo/scripting/SConscript b/src/mongo/scripting/SConscript index 34a9d9e3f6e..81c3f08143e 100644 --- a/src/mongo/scripting/SConscript +++ b/src/mongo/scripting/SConscript @@ -53,6 +53,15 @@ env.Library( if usemozjs: scriptingEnv = env.Clone() + + scriptingEnv.Append( + CXXFLAGS=[ + # TODO(SERVER-59992): Remove -Wno-class-memacces where possible. + '-Wno-unknown-warning-option', + '-Wno-class-memaccess', + ], + ) + scriptingEnv.InjectMozJS() scriptingEnv.JSHeader( diff --git a/src/mongo/shell/SConscript b/src/mongo/shell/SConscript index 5aaf1273338..259acb23846 100644 --- a/src/mongo/shell/SConscript +++ b/src/mongo/shell/SConscript @@ -182,6 +182,15 @@ if get_option('ssl') == 'on': if get_option('js-engine') != 'none': scriptingEnv = env.Clone() + + scriptingEnv.Append( + CXXFLAGS=[ + # TODO(SERVER-59992): Remove -Wno-class-memacces where possible. + '-Wno-unknown-warning-option', + '-Wno-class-memaccess', + ], + ) + scriptingEnv.InjectMozJS() scriptingEnv.Library( diff --git a/src/third_party/benchmark/SConscript b/src/third_party/benchmark/SConscript index f4841f3631b..dbbcb5fef3f 100644 --- a/src/third_party/benchmark/SConscript +++ b/src/third_party/benchmark/SConscript @@ -12,7 +12,14 @@ if env.TargetOSIs('windows'): env.Append(LIBS=["ShLwApi"]) -env.Append(CPPDEFINES=["HAVE_STD_REGEX"]) +env.Append( + CPPDEFINES=["HAVE_STD_REGEX"], + CXXFLAGS=[ + # TODO(SERVER-59996): Fix warnings with -Wstringop-truncation when possible + '-Wno-unknown-warning-option', + '-Wno-stringop-truncation', + ], +) src_dir=env.Dir('dist/src') |