From 58dfb09957cf168ef879dffa1599594bccec3936 Mon Sep 17 00:00:00 2001 From: Benety Goh Date: Tue, 22 Feb 2022 19:37:20 +0000 Subject: SERVER-63882 resolve libdeps_graph_linting warnings --- src/mongo/db/SConscript | 6 ++++-- src/mongo/db/ftdc/SConscript | 4 ++-- src/mongo/db/fts/SConscript | 6 ++++-- src/mongo/db/storage/SConscript | 4 +++- src/mongo/util/concurrency/SConscript | 2 +- src/mongo/watchdog/SConscript | 8 +++----- 6 files changed, 17 insertions(+), 13 deletions(-) (limited to 'src/mongo') diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index 51826089582..f15f7660846 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -1540,11 +1540,13 @@ envWithAsio.Library( 'service_liaison_mock.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/executor/async_timer_mock', '$BUILD_DIR/mongo/util/periodic_runner_factory', 'kill_sessions', 'service_liaison', ], + LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/executor/async_timer_mock', + ], ) envWithAsio.Library( @@ -1989,7 +1991,7 @@ env.Library( source=[ 'write_block_bypass_propagation_egress_hook.cpp', ], - LIBDEPS=[ + LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/rpc/metadata', ], ) diff --git a/src/mongo/db/ftdc/SConscript b/src/mongo/db/ftdc/SConscript index 6bd638ca684..72a96523195 100644 --- a/src/mongo/db/ftdc/SConscript +++ b/src/mongo/db/ftdc/SConscript @@ -71,13 +71,13 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', - '$BUILD_DIR/mongo/db/storage/storage_options', - 'ftdc_server' ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/auth/auth', '$BUILD_DIR/mongo/db/auth/authprivilege', + '$BUILD_DIR/mongo/db/storage/storage_options', '$BUILD_DIR/mongo/idl/server_parameter', + 'ftdc_server' ], ) diff --git a/src/mongo/db/fts/SConscript b/src/mongo/db/fts/SConscript index 2d4910b1c28..c6ceb5abb4d 100644 --- a/src/mongo/db/fts/SConscript +++ b/src/mongo/db/fts/SConscript @@ -81,9 +81,11 @@ env.Library( 'ftsmongod.cpp', ], LIBDEPS=[ - "$BUILD_DIR/mongo/base", "base_fts", - ] + ], + LIBDEPS_PRIVATE=[ + "$BUILD_DIR/mongo/base", + ], ) env.CppUnitTest( diff --git a/src/mongo/db/storage/SConscript b/src/mongo/db/storage/SConscript index ee3bed22687..20645a4ae85 100644 --- a/src/mongo/db/storage/SConscript +++ b/src/mongo/db/storage/SConscript @@ -233,9 +233,11 @@ env.Library( '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/storage/storage_options', '$BUILD_DIR/mongo/unittest/unittest', - 'index_entry_comparison', 'key_string', ], + LIBDEPS_PRIVATE=[ + 'index_entry_comparison', + ], ) env.Library( diff --git a/src/mongo/util/concurrency/SConscript b/src/mongo/util/concurrency/SConscript index 540f2ea03ef..607f155aae8 100644 --- a/src/mongo/util/concurrency/SConscript +++ b/src/mongo/util/concurrency/SConscript @@ -20,7 +20,7 @@ env.Library( 'thread_pool_test_common.cpp', 'thread_pool_test_fixture.cpp' ], - LIBDEPS=[ + LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/unittest/unittest', ] ) diff --git a/src/mongo/watchdog/SConscript b/src/mongo/watchdog/SConscript index 55c5689b0f7..102c548c689 100644 --- a/src/mongo/watchdog/SConscript +++ b/src/mongo/watchdog/SConscript @@ -27,15 +27,13 @@ env.Library( 'watchdog_mongod.cpp', 'watchdog_mongod.idl', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/db/commands/server_status', - 'watchdog', - ], LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/db/commands/server_status', '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/idl/server_parameter', + 'watchdog', 'watchdog_register', - ], + ], ) env.CppUnitTest( -- cgit v1.2.1