diff options
| author | auto-revert-processor <dev-prod-dag@mongodb.com> | 2023-05-03 10:20:43 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-05-03 11:18:57 +0000 |
| commit | 772fb2aff2b49da52b26c4240bd366eb576396f7 (patch) | |
| tree | 6136bed2c38f84ac748053e659872bccdbc48cc5 | |
| parent | 47f11cb89f5d1aabc3e7121868ca454babb0f681 (diff) | |
| download | mongo-772fb2aff2b49da52b26c4240bd366eb576396f7.tar.gz | |
Revert "SERVER-76643 do not print warnings from building rdkafka or libbson"
This reverts commit 61cfb094c61b3d23566718c0c130074f711ea61d.
| -rw-r--r-- | src/third_party/libbson/SConscript | 19 | ||||
| -rw-r--r-- | src/third_party/librdkafka/SConscript | 6 |
2 files changed, 13 insertions, 12 deletions
diff --git a/src/third_party/libbson/SConscript b/src/third_party/libbson/SConscript index ff39da6acd9..d83660df4c3 100644 --- a/src/third_party/libbson/SConscript +++ b/src/third_party/libbson/SConscript @@ -3,15 +3,16 @@ Import("env") env = env.Clone() -env.Append( - CPPDEFINES=['BSON_COMPILATION'], - CPPPATH=["dist/src/common"], -) +env.Append(CPPDEFINES=[ + 'BSON_COMPILATION', +]) +env.Append(CPPPATH=["dist/src/common"]) + +# Libbson is not warning clean +env['CCFLAGS_WERROR'] = [] +env['CXXFLAGS_WERROR'] = [] -if env.ToolchainIs('msvc'): - env.Append(CCFLAGS=['/wd4388', '/wd4389', '/wd4146', '/wd4018']) # msvc sign-compare warnings -else: - env.Append(CCFLAGS=['-Wno-sign-compare']) +additional_sources = [] env.Library( target="libbson", @@ -41,7 +42,7 @@ env.Library( 'dist/src/libbson/src/bson/bson-version-functions.c', 'dist/src/libbson/src/bson/bson-writer.c', 'dist/src/libbson/src/jsonsl/jsonsl.c', - ], + ] + additional_sources, LIBDEPS_TAGS=[ 'init-no-global-side-effects', ], diff --git a/src/third_party/librdkafka/SConscript b/src/third_party/librdkafka/SConscript index 2166bec9f93..fa962c0a65c 100644 --- a/src/third_party/librdkafka/SConscript +++ b/src/third_party/librdkafka/SConscript @@ -17,11 +17,11 @@ else: env.FatalError("Unsupported platform for librdkafka builds.") # Suppress some warnings in librdkafka builds. -env.Append(CCFLAGS=['-Wno-unused-variable']) +env.Append(CCFLAGS=['-Wno-error=unused-variable']) if env.ToolchainIs('clang'): - env.Append(CCFLAGS=['-Wno-uninitialized']) + env.Append(CCFLAGS=['-Wno-error=uninitialized']) else: - env.Append(CCFLAGS=['-Wno-maybe-uninitialized']) + env.Append(CCFLAGS=['-Wno-error=maybe-uninitialized']) def remove_define(env, define_to_remove): |