diff options
Diffstat (limited to 'src/mongo/client')
| -rw-r--r-- | src/mongo/client/SConscript | 18 | ||||
| -rw-r--r-- | src/mongo/client/sdam/SConscript | 29 |
2 files changed, 25 insertions, 22 deletions
diff --git a/src/mongo/client/SConscript b/src/mongo/client/SConscript index f6d531a737e..fbf77caa24c 100644 --- a/src/mongo/client/SConscript +++ b/src/mongo/client/SConscript @@ -50,8 +50,8 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/idl/idl_parser', '$BUILD_DIR/mongo/db/server_options_core', # For object_check.h + '$BUILD_DIR/mongo/idl/idl_parser', ], ) @@ -69,9 +69,9 @@ kmsEnv.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/third_party/shim_kms_message', - '$BUILD_DIR/mongo/idl/idl_parser', '$BUILD_DIR/mongo/db/server_options_core', # For object_check.h + '$BUILD_DIR/mongo/idl/idl_parser', + '$BUILD_DIR/third_party/shim_kms_message', 'sasl_aws_common', ], ) @@ -113,7 +113,6 @@ saslClientEnv.Library( target='sasl_client', source=saslClientSource, LIBDEPS=[ - "sasl_aws_client" if get_option('ssl') == 'on' else '', '$BUILD_DIR/mongo/base/secure_allocator', '$BUILD_DIR/mongo/bson/util/bson_extract', '$BUILD_DIR/mongo/executor/remote_command', @@ -123,6 +122,7 @@ saslClientEnv.Library( '$BUILD_DIR/mongo/util/md5', '$BUILD_DIR/mongo/util/net/network', '$BUILD_DIR/mongo/util/options_parser/options_parser', + "sasl_aws_client" if get_option('ssl') == 'on' else '', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/util/net/http_client', @@ -294,8 +294,8 @@ env.Library( 'remote_command_targeter_standalone.cpp', ], LIBDEPS=[ - 'clientdriver_network', '$BUILD_DIR/mongo/db/service_context', + 'clientdriver_network', ], ) @@ -306,8 +306,8 @@ env.Library( 'remote_command_targeter_factory_mock.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/util/net/network', '$BUILD_DIR/mongo/s/coreshard', + '$BUILD_DIR/mongo/util/net/network', ], ) @@ -317,11 +317,11 @@ env.Library( 'fetcher.cpp', ], LIBDEPS=[ - 'remote_command_retry_scheduler', - '$BUILD_DIR/mongo/executor/task_executor_interface', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/namespace_string', + '$BUILD_DIR/mongo/executor/task_executor_interface', '$BUILD_DIR/mongo/rpc/command_status', + 'remote_command_retry_scheduler', ], ) @@ -331,8 +331,8 @@ env.Library( 'remote_command_retry_scheduler.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/executor/task_executor_interface', '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/executor/task_executor_interface', ], ) diff --git a/src/mongo/client/sdam/SConscript b/src/mongo/client/sdam/SConscript index 5411b15c8f3..42c50529b3e 100644 --- a/src/mongo/client/sdam/SConscript +++ b/src/mongo/client/sdam/SConscript @@ -28,12 +28,12 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/client/read_preference', '$BUILD_DIR/mongo/db/repl/optime', - '$BUILD_DIR/mongo/util/clock_sources', - '$BUILD_DIR/mongo/client/read_preference', - '$BUILD_DIR/mongo/executor/task_executor_interface', '$BUILD_DIR/mongo/db/wire_version', + '$BUILD_DIR/mongo/executor/task_executor_interface', '$BUILD_DIR/mongo/rpc/metadata', + '$BUILD_DIR/mongo/util/clock_sources', 'sdam_configuration_parameters', ], ) @@ -45,12 +45,14 @@ sdam_json_test = env.Program( 'sdam_json_test_runner.cpp'], AIB_COMPONENT="sdam-json-test", LIBDEPS=[ - 'sdam', - 'sdam_test', + '$BUILD_DIR/mongo/client/connection_string', + '$BUILD_DIR/mongo/util/clock_source_mock', 'json_test', + 'sdam', 'sdam_configuration_parameters', - '$BUILD_DIR/mongo/util/clock_source_mock', - '$BUILD_DIR/mongo/client/connection_string'], + 'sdam_test', + ], + )[0] server_selection_json_test = env.Program( @@ -59,12 +61,13 @@ server_selection_json_test = env.Program( 'server_selection_json_test_runner.cpp'], AIB_COMPONENT="server-selection-json-test", LIBDEPS=[ - 'sdam', - 'sdam_test', + '$BUILD_DIR/mongo/client/connection_string', + '$BUILD_DIR/mongo/util/clock_source_mock', 'json_test', + 'sdam', 'sdam_configuration_parameters', - '$BUILD_DIR/mongo/util/clock_source_mock', - '$BUILD_DIR/mongo/client/connection_string'], + 'sdam_test', + ], )[0] env.Library( @@ -74,9 +77,9 @@ env.Library( env.Idlc('json_test_runner_cli_options.idl')[0], ], LIBDEPS=[ - 'sdam', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/util/options_parser/options_parser', + 'sdam', ], ) @@ -87,8 +90,8 @@ env.Library( 'topology_listener_mock.cpp', ], LIBDEPS=[ - 'sdam', '$BUILD_DIR/mongo/base', + 'sdam', ], ) |