diff options
author | Andrew Morrow <acm@mongodb.com> | 2021-04-30 14:34:52 -0400 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-07-06 20:05:05 +0000 |
commit | 1c41fa28a3ce3a5e661e951aa0d435de6815797d (patch) | |
tree | 6331e7b7aaff3bec268ec5fd803d52dc349a6dad | |
parent | ae3d4c49b858e37ddf7f9e4f95da17e59a977291 (diff) | |
download | mongo-1c41fa28a3ce3a5e661e951aa0d435de6815797d.tar.gz |
SERVER-48291 Restore design of the boost assert shim
This was inadvertently lumped in with the other ShimLibrary
conversions, but it doesn't actually follow the model. This
library has real symbols.
-rw-r--r-- | src/mongo/SConscript | 2 | ||||
-rw-r--r-- | src/mongo/util/SConscript | 9 | ||||
-rw-r--r-- | src/mongo/util/boost_assert_impl.cpp | 2 | ||||
-rw-r--r-- | src/mongo/util/boost_assert_shim.cpp (renamed from src/mongo/util/shim_boost_assert.cpp) | 2 | ||||
-rw-r--r-- | src/mongo/util/boost_assert_shim.h (renamed from src/mongo/util/shim_boost_assert.h) | 0 | ||||
-rw-r--r-- | src/third_party/boost/SConscript | 12 |
6 files changed, 14 insertions, 13 deletions
diff --git a/src/mongo/SConscript b/src/mongo/SConscript index d2925d1f0e6..0714eba23ac 100644 --- a/src/mongo/SConscript +++ b/src/mongo/SConscript @@ -266,7 +266,7 @@ baseEnv.Library( '$BUILD_DIR/third_party/shim_pcrecpp', '$BUILD_DIR/third_party/shim_unwind' if use_libunwind else [], 'stdx/stdx', - 'util/shim_boost_assert', + 'util/boost_assert_shim', ], AIB_COMPONENT='platform', ) diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript index f0fc66759a2..8e5baa99c7e 100644 --- a/src/mongo/util/SConscript +++ b/src/mongo/util/SConscript @@ -68,12 +68,13 @@ if env.TargetOSIs('windows'): env.Alias('generated-sources', generatedResourceConstantFile) # Shim library for boost to depend on -env.ShimLibrary( - name='boost_assert', - needs_link=True, +env.Library( + target='boost_assert_shim', + source=[ + 'boost_assert_shim.cpp', + ], LIBDEPS_TAGS=[ # NOTE: This library *must not* depend on any mongodb code - # TODO: Remove when SERVER-48291 is merged into stable build tools 'lint-leaf-node-no-deps', ], ) diff --git a/src/mongo/util/boost_assert_impl.cpp b/src/mongo/util/boost_assert_impl.cpp index 1c993ec8d27..f77ed7f2b0e 100644 --- a/src/mongo/util/boost_assert_impl.cpp +++ b/src/mongo/util/boost_assert_impl.cpp @@ -28,7 +28,7 @@ */ #include "mongo/util/assert_util.h" -#include "mongo/util/shim_boost_assert.h" +#include "mongo/util/boost_assert_shim.h" #if defined(BOOST_ENABLE_ASSERT_DEBUG_HANDLER) && !defined(NDEBUG) diff --git a/src/mongo/util/shim_boost_assert.cpp b/src/mongo/util/boost_assert_shim.cpp index 29e565c7bba..9f10b378e91 100644 --- a/src/mongo/util/shim_boost_assert.cpp +++ b/src/mongo/util/boost_assert_shim.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "shim_boost_assert.h" +#include "boost_assert_shim.h" #if defined(BOOST_ENABLE_ASSERT_DEBUG_HANDLER) && !defined(NDEBUG) diff --git a/src/mongo/util/shim_boost_assert.h b/src/mongo/util/boost_assert_shim.h index 392672074c6..392672074c6 100644 --- a/src/mongo/util/shim_boost_assert.h +++ b/src/mongo/util/boost_assert_shim.h diff --git a/src/third_party/boost/SConscript b/src/third_party/boost/SConscript index 1b1e553e880..2c7e4456d43 100644 --- a/src/third_party/boost/SConscript +++ b/src/third_party/boost/SConscript @@ -22,7 +22,7 @@ env.Library( 'libs/system/src/error_code.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/util/shim_boost_assert', + '$BUILD_DIR/mongo/util/boost_assert_shim', ], ) @@ -41,7 +41,7 @@ env.Library( 'libs/filesystem/src/windows_file_codecvt.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/util/shim_boost_assert', + '$BUILD_DIR/mongo/util/boost_assert_shim', 'boost_system', ], ) @@ -67,7 +67,7 @@ env.Library( 'illegal_cyclic_or_unresolved_dependencies_allowlisted', ], LIBDEPS=[ - '$BUILD_DIR/mongo/util/shim_boost_assert', + '$BUILD_DIR/mongo/util/boost_assert_shim', ], ) @@ -78,7 +78,7 @@ env.Library( 'libs/iostreams/src/mapped_file.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/util/shim_boost_assert', + '$BUILD_DIR/mongo/util/boost_assert_shim', 'boost_system', ]) @@ -108,7 +108,7 @@ threadlib_env.Library( 'libs/thread/src/future.cpp', ] + boost_thread_source, LIBDEPS=[ - '$BUILD_DIR/mongo/util/shim_boost_assert', + '$BUILD_DIR/mongo/util/boost_assert_shim', ] ) @@ -169,7 +169,7 @@ loglib_env.Library( 'libs/log/src/trivial.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/util/shim_boost_assert', + '$BUILD_DIR/mongo/util/boost_assert_shim', 'boost_filesystem', 'boost_thread', ] |