SERVER-36082 Don't link getShardMap into embedded

6 files changed, 19 insertions, 11 deletions

diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index 4f7b261f7bc..ab113daa671 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -1325,7 +1325,7 @@ env.Library(
         'sessions_collection_sharded',
     ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/s/commands/shared_cluster_commands',
+        '$BUILD_DIR/mongo/s/commands/cluster_commands_helpers',
     ]
 )
 
diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript
index 2216e68abae..7eaa962ea1f 100644
--- a/src/mongo/db/s/SConscript
+++ b/src/mongo/db/s/SConscript
@@ -259,6 +259,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/index_d',
         '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface',
         '$BUILD_DIR/mongo/db/repl/replica_set_messages',
+        '$BUILD_DIR/mongo/s/commands/cluster_commands_helpers',
         '$BUILD_DIR/mongo/s/commands/shared_cluster_commands',
         'balancer',
         'sharding_runtime_d',
diff --git a/src/mongo/embedded/capi_test.cpp b/src/mongo/embedded/capi_test.cpp
index 0efaacba25f..469c6f6bc6d 100644
--- a/src/mongo/embedded/capi_test.cpp
+++ b/src/mongo/embedded/capi_test.cpp
@@ -547,7 +547,6 @@ TEST_F(MongodbCAPITest, RunListCommands) {
                                           "getMore",
                                           "getParameter",
                                           "getPrevError",
-                                          "getShardMap",
                                           "insert",
                                           "isMaster",
                                           "killCursors",
diff --git a/src/mongo/s/commands/SConscript b/src/mongo/s/commands/SConscript
index 9a6680c10ed..6369009c1e3 100644
--- a/src/mongo/s/commands/SConscript
+++ b/src/mongo/s/commands/SConscript
@@ -5,16 +5,26 @@ Import("get_option")
 
 env = env.Clone()
 
-# These commands are linked both in MongoS and MongoD
 env.Library(
-    target='shared_cluster_commands',
+    target='cluster_commands_helpers',
     source=[
         'cluster_commands_helpers.cpp',
-        'cluster_get_shard_map_cmd.cpp',
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/curop',
         '$BUILD_DIR/mongo/s/async_requests_sender',
+    ],
+)
+
+# These commands are linked both in MongoS and MongoD
+env.Library(
+    target='shared_cluster_commands',
+    source=[
+        'cluster_get_shard_map_cmd.cpp',
+    ],
+    LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/db/commands',
+        '$BUILD_DIR/mongo/s/grid',
     ]
 )
 
@@ -128,7 +138,7 @@ env.CppUnitTest(
         'append_at_cluster_time_test.cpp',
     ],
     LIBDEPS=[
-        'shared_cluster_commands',
+        'cluster_commands_helpers',
         '$BUILD_DIR/mongo/db/auth/authmocks',
         '$BUILD_DIR/mongo/db/service_context_noop_init',
         '$BUILD_DIR/mongo/db/logical_time',
@@ -142,7 +152,7 @@ env.CppUnitTest(
         'compute_at_cluster_time_test.cpp',
     ],
     LIBDEPS=[
-        'shared_cluster_commands',
+        'cluster_commands_helpers',
         '$BUILD_DIR/mongo/s/catalog_cache_test_fixture',
         '$BUILD_DIR/mongo/db/auth/authmocks',
         '$BUILD_DIR/mongo/db/service_context_noop_init',
diff --git a/src/mongo/s/query/SConscript b/src/mongo/s/query/SConscript
index cd9a6c903c4..023a966bcab 100644
--- a/src/mongo/s/query/SConscript
+++ b/src/mongo/s/query/SConscript
@@ -15,7 +15,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/curop',
         '$BUILD_DIR/mongo/db/curop_failpoint_helpers',
         '$BUILD_DIR/mongo/db/query/query_common',
-        '$BUILD_DIR/mongo/s/commands/shared_cluster_commands',
+        '$BUILD_DIR/mongo/s/commands/cluster_commands_helpers',
         "cluster_client_cursor",
         "cluster_cursor_cleanup_job",
         "store_possible_cursor",
diff --git a/src/mongo/s/write_ops/SConscript b/src/mongo/s/write_ops/SConscript
index fd10368b310..593d65a4d23 100644
--- a/src/mongo/s/write_ops/SConscript
+++ b/src/mongo/s/write_ops/SConscript
@@ -33,11 +33,9 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/s/async_requests_sender',
+        '$BUILD_DIR/mongo/s/commands/cluster_commands_helpers',
         'batch_write_types',
     ],
-    LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/s/commands/shared_cluster_commands',
-    ]
 )
 
 env.Library(