SERVER-23210 Clean up library dependencies and fix dynamic linking

4 files changed, 8 insertions, 27 deletions

diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript
index e8343dc4ee5..15a8b46d39e 100644
--- a/src/mongo/s/SConscript
+++ b/src/mongo/s/SConscript
@@ -23,7 +23,10 @@ env.Library(
         '$BUILD_DIR/mongo/executor/network_interface_factory',
         '$BUILD_DIR/mongo/executor/network_interface_thread_pool',
         '$BUILD_DIR/mongo/executor/thread_pool_task_executor',
-        '$BUILD_DIR/mongo/s/catalog/catalog_manager_impl',
+        '$BUILD_DIR/mongo/s/catalog/catalog_cache',
+        '$BUILD_DIR/mongo/s/catalog/replset/catalog_manager_replica_set',
+        '$BUILD_DIR/mongo/s/catalog/replset/dist_lock_catalog_impl',
+        '$BUILD_DIR/mongo/s/catalog/replset/replset_dist_lock_manager',
         'client/sharding_connection_hook',
         'coreshard',
         'cluster_last_error_info',
@@ -66,7 +69,6 @@ env.Library(
         '$BUILD_DIR/mongo/executor/thread_pool_task_executor_test_fixture',
         '$BUILD_DIR/mongo/rpc/metadata',
         '$BUILD_DIR/mongo/s/catalog/dist_lock_manager_mock',
-        '$BUILD_DIR/mongo/s/catalog/catalog_manager_impl',
         '$BUILD_DIR/mongo/s/catalog/replset/catalog_manager_replica_set',
         '$BUILD_DIR/mongo/client/remote_command_targeter_mock',
         '$BUILD_DIR/mongo/s/coreshard',
@@ -173,8 +175,8 @@ env.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/s/query/cluster_cursor_manager',
         '$BUILD_DIR/mongo/executor/task_executor_pool',
-        'catalog/catalog_manager_impl',
         'catalog/catalog_types',
+        'catalog/replset/catalog_manager_replica_set',
         'client/sharding_client',
         'cluster_ops_impl',
         'common',
diff --git a/src/mongo/s/catalog/SConscript b/src/mongo/s/catalog/SConscript
index a659649de94..3f44dfe439e 100644
--- a/src/mongo/s/catalog/SConscript
+++ b/src/mongo/s/catalog/SConscript
@@ -47,29 +47,7 @@ env.Library(
         'catalog_cache.cpp',
     ],
     LIBDEPS=[
-        'catalog_manager_impl',
-    ],
-)
-
-env.Library(
-    target='catalog_manager_impl',
-    source=[
-    ],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/db/common',
-        '$BUILD_DIR/mongo/s/write_ops/batch_write_types',
-        '$BUILD_DIR/mongo/s/common',
-        '$BUILD_DIR/mongo/s/catalog/catalog_types',
-        '$BUILD_DIR/mongo/s/client/sharding_client',
-        'dist_lock_manager',
-        'replset/catalog_manager_replica_set',
-        'replset/dist_lock_catalog_impl',
-        'replset/replset_dist_lock_manager',
-    ],
-    LIBDEPS_TAGS=[
-        # Circular with coreshard for mongo::grid and mongo::DBConfig.
-        'incomplete',
+        '$BUILD_DIR/mongo/s/coreshard',
     ],
 )
 
@@ -79,7 +57,6 @@ env.Library(
         'catalog_manager_mock.cpp',
     ],
     LIBDEPS=[
-        'catalog_manager_impl',
         'dist_lock_manager_mock',
     ]
 )
diff --git a/src/mongo/s/catalog/replset/SConscript b/src/mongo/s/catalog/replset/SConscript
index beed950b8b6..e7470e83f5d 100644
--- a/src/mongo/s/catalog/replset/SConscript
+++ b/src/mongo/s/catalog/replset/SConscript
@@ -55,6 +55,7 @@ env.CppUnitTest(
         '$BUILD_DIR/mongo/s/sharding_test_fixture',
         '$BUILD_DIR/mongo/util/tick_source_mock',
         'dist_lock_catalog_impl',
+        'replset_dist_lock_manager',
     ]
 )
 
diff --git a/src/mongo/s/query/SConscript b/src/mongo/s/query/SConscript
index afec3a3dd34..7111149ce0c 100644
--- a/src/mongo/s/query/SConscript
+++ b/src/mongo/s/query/SConscript
@@ -10,6 +10,7 @@ env.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/commands',
         '$BUILD_DIR/mongo/db/query/query_common',
+        '$BUILD_DIR/mongo/s/catalog/catalog_cache',
         "cluster_client_cursor",
         "cluster_cursor_cleanup_job",
         "store_possible_cursor",