SERVER-23103 Add some missing libdeps edges

10 files changed, 39 insertions, 28 deletions

diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index e8af00437ed..8b3e4b6e6cc 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -343,42 +343,29 @@ if not has_option('noshell') and usemozjs:
                     "shell/linenoise.cpp",
                     "shell/mk_wcwidth.cpp",
                     "shell/mongo-server.cpp",
+                    "shell/shell_options.cpp",
+                    "shell/shell_options_init.cpp",
                     "shell/shell_utils.cpp",
                     "shell/shell_utils_extended.cpp",
                     "shell/shell_utils_launcher.cpp",
-                    "shell/shell_options_init.cpp"
                 ],
                 LIBDEPS=[
                     'db/catalog/index_key_validate',
                     'db/index/external_key_generator',
                     'db/query/command_request_response',
                     'db/query/lite_parsed_query',
+                    'db/server_options_core',
                     'linenoise_utf8',
+                    'rpc/protocol',
                     'scripting/scripting',
                     'shell/mongojs',
+                    'util/net/network',
+                    'util/options_parser/options_parser_init',
                     'util/processinfo',
                     'util/signal_handlers',
                 ],
-                LIBDEPS_TAGS=[
-                    # Circular with shell_options below. It is unclear
-                    # why this is split into two libraries, or even
-                    # why these libraries exist at all, since it seems
-                    # that the only thing that links them is the shell
-                    # itself.
-                    'incomplete',
-                ],
     )
 
-    # mongo shell options
-    shell_core_env.Library("shell_options", ["shell/shell_options.cpp"],
-                LIBDEPS=[
-                    '$BUILD_DIR/mongo/db/server_options_core',
-                    '$BUILD_DIR/mongo/rpc/protocol',
-                    '$BUILD_DIR/mongo/util/net/network',
-                    '$BUILD_DIR/mongo/util/options_parser/options_parser_init',
-                    'shell_core',
-                ])
-
     shellEnv = env.Clone()
     if env.TargetOSIs('windows'):
        shellEnv.Append(LIBS=["winmm.lib"])
@@ -387,7 +374,6 @@ if not has_option('noshell') and usemozjs:
         "mongo",
         "shell/dbshell.cpp",
         LIBDEPS=["$BUILD_DIR/third_party/shim_pcrecpp",
-                 "shell_options",
                  "shell_core",
                  "db/server_options_core",
                  "client/clientdriver",
diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript
index 84b9d5ab02d..74935b95a60 100644
--- a/src/mongo/db/commands/SConscript
+++ b/src/mongo/db/commands/SConscript
@@ -67,6 +67,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/stats/timer_stats',
         '$BUILD_DIR/mongo/logger/parse_log_component_settings',
         '$BUILD_DIR/mongo/s/client/sharding_client',
+        '$BUILD_DIR/mongo/s/coreshard',
         '$BUILD_DIR/mongo/s/write_ops/batch_write_types',
         '$BUILD_DIR/mongo/scripting/scripting_common',
         '$BUILD_DIR/mongo/util/cmdline_utils/cmdline_utils',
@@ -74,10 +75,6 @@ env.Library(
         '$BUILD_DIR/mongo/util/processinfo',
         'server_status_core',
     ],
-    LIBDEPS_TAGS=[
-        # Depends on coreshard.
-        'incomplete',
-    ],
 )
 
 
diff --git a/src/mongo/db/exec/SConscript b/src/mongo/db/exec/SConscript
index e7d5da0dbd5..55cc7ebcbe1 100644
--- a/src/mongo/db/exec/SConscript
+++ b/src/mongo/db/exec/SConscript
@@ -82,7 +82,18 @@ env.Library(
         "scoped_timer",
         "working_set",
         "$BUILD_DIR/mongo/base",
+        "$BUILD_DIR/mongo/db/concurrency/write_conflict_exception",
+        "$BUILD_DIR/mongo/db/commands",
+        "$BUILD_DIR/mongo/db/curop",
+        "$BUILD_DIR/mongo/db/fts/base",
+        "$BUILD_DIR/mongo/db/index/index_descriptor",
+        "$BUILD_DIR/mongo/db/index/key_generator",
         "$BUILD_DIR/mongo/db/ops/update_driver",
+        "$BUILD_DIR/mongo/db/pipeline/pipeline",
+        "$BUILD_DIR/mongo/db/repl/repl_coordinator_global",
+        "$BUILD_DIR/mongo/scripting/scripting",
+        "$BUILD_DIR/mongo/db/storage/storage_options",
+        "$BUILD_DIR/mongo/s/coreshard",
         '$BUILD_DIR/third_party/s2/s2',
     ],
     LIBDEPS_TAGS=[
diff --git a/src/mongo/db/ftdc/SConscript b/src/mongo/db/ftdc/SConscript
index 67601b2d3ab..be3a511a92d 100644
--- a/src/mongo/db/ftdc/SConscript
+++ b/src/mongo/db/ftdc/SConscript
@@ -39,7 +39,10 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
+        '$BUILD_DIR/mongo/db/commands',
+        '$BUILD_DIR/mongo/db/repl/repl_coordinator_global',
         '$BUILD_DIR/mongo/db/server_parameters',
+        '$BUILD_DIR/mongo/db/storage/storage_options',
         'ftdc'
     ],
     LIBDEPS_TAGS=[
diff --git a/src/mongo/db/matcher/SConscript b/src/mongo/db/matcher/SConscript
index cb267e448d2..462113742d1 100644
--- a/src/mongo/db/matcher/SConscript
+++ b/src/mongo/db/matcher/SConscript
@@ -133,6 +133,8 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/auth/authorization_manager_global',
+        '$BUILD_DIR/mongo/db/concurrency/lock_manager',
+        '$BUILD_DIR/mongo/db/fts/base',
         '$BUILD_DIR/mongo/scripting/scripting_server',
         'expressions',
     ],
diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript
index 8cce6818d02..a64778ca1a2 100644
--- a/src/mongo/db/repl/SConscript
+++ b/src/mongo/db/repl/SConscript
@@ -222,9 +222,12 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/auth/authorization_manager_global',
+        '$BUILD_DIR/mongo/db/commands/server_status_core',
         '$BUILD_DIR/mongo/db/concurrency/lock_manager',
         '$BUILD_DIR/mongo/db/concurrency/write_conflict_exception',
         '$BUILD_DIR/mongo/db/curop',
+        '$BUILD_DIR/mongo/db/stats/timer_stats',
+        '$BUILD_DIR/mongo/db/storage/storage_options',
         '$BUILD_DIR/mongo/util/concurrency/thread_pool',
         'oplog_entry',
         'repl_coordinator_global',
@@ -511,9 +514,14 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
+        '$BUILD_DIR/mongo/db/commands',
         '$BUILD_DIR/mongo/db/concurrency/lock_manager',
+        '$BUILD_DIR/mongo/db/lasterror',
         '$BUILD_DIR/mongo/db/repl/repl_coordinator_global',
+        '$BUILD_DIR/mongo/db/storage/storage_options',
+        'repl_settings',
         'replica_set_messages',
+        'replication_executor',
     ],
     LIBDEPS_TAGS=[
         # Depends on files in serverOnlyFiles
diff --git a/src/mongo/db/storage/kv/SConscript b/src/mongo/db/storage/kv/SConscript
index a9d538dca46..b00678c3d26 100644
--- a/src/mongo/db/storage/kv/SConscript
+++ b/src/mongo/db/storage/kv/SConscript
@@ -87,6 +87,7 @@ env.Library(
         ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/service_context',
+        '$BUILD_DIR/mongo/db/storage/storage_options',
         '$BUILD_DIR/mongo/unittest/unittest',
         'kv_engine_core',
         ],
diff --git a/src/mongo/db/storage/mmap_v1/SConscript b/src/mongo/db/storage/mmap_v1/SConscript
index 542cae3840a..a45c3b4fb0e 100644
--- a/src/mongo/db/storage/mmap_v1/SConscript
+++ b/src/mongo/db/storage/mmap_v1/SConscript
@@ -36,8 +36,13 @@ env.Library(
         'logfile',
         'compress',
         '$BUILD_DIR/mongo/db/catalog/collection_options',
+        '$BUILD_DIR/mongo/db/commands',
+        '$BUILD_DIR/mongo/db/concurrency/lock_manager',
+        '$BUILD_DIR/mongo/db/index_names',
+        '$BUILD_DIR/mongo/db/index/index_descriptor',
         '$BUILD_DIR/mongo/db/storage/journal_listener',
         '$BUILD_DIR/mongo/db/storage/paths',
+        '$BUILD_DIR/mongo/db/storage/storage_engine_lock_file',
     ],
     LIBDEPS_TAGS=[
         # Many undefined symbols
diff --git a/src/mongo/rpc/SConscript b/src/mongo/rpc/SConscript
index 0e5f851e871..ac576b31803 100644
--- a/src/mongo/rpc/SConscript
+++ b/src/mongo/rpc/SConscript
@@ -24,10 +24,7 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
-    ],
-    LIBDEPS_TAGS=[
-        # Depends on validation in a strange way right now
-        'incomplete'
+        '$BUILD_DIR/mongo/db/server_options_core',
     ],
 )
 
diff --git a/src/mongo/s/client/SConscript b/src/mongo/s/client/SConscript
index a72d106d893..52d19d0a44f 100644
--- a/src/mongo/s/client/SConscript
+++ b/src/mongo/s/client/SConscript
@@ -15,6 +15,7 @@ env.Library(
         '$BUILD_DIR/mongo/client/fetcher',
         '$BUILD_DIR/mongo/client/remote_command_runner_impl',
         '$BUILD_DIR/mongo/client/remote_command_targeter',
+        '$BUILD_DIR/mongo/db/commands',
         '$BUILD_DIR/mongo/executor/connection_pool_stats',
         '$BUILD_DIR/mongo/executor/task_executor_pool',
         '$BUILD_DIR/mongo/rpc/metadata',