2 files changed, 16 insertions, 16 deletions
diff --git a/src/mongo/embedded/mongo_embedded/SConscript b/src/mongo/embedded/mongo_embedded/SConscript
index 283a5b3b396..5b9ab7ef339 100644
--- a/src/mongo/embedded/mongo_embedded/SConscript
+++ b/src/mongo/embedded/mongo_embedded/SConscript
@@ -1,13 +1,11 @@
 # -*- mode: python; -*-
 
+from functools import partial
+import libdeps
+
 Import("env")
 Import("get_option")
 
-if get_option('build-tools') == 'next':
-    import libdeps_next as libdeps
-else:
-    import libdeps
-
 env = env.Clone()
 
 env.AutoInstall(
@@ -34,9 +32,11 @@ if get_option('link-model') == 'static':
         ],
     )
 elif get_option('link-model') == 'dynamic-sdk':
-    mongoEmbeddedEnv['LIBDEPS_SHLIBEMITTER'] = libdeps.make_libdeps_emitter(
-        'SharedArchive',
-        libdeps.dependency_visibility_honored
+    # TODO(SERVER-59134): This fails to honor the libdeps-debug flag
+    mongoEmbeddedEnv['LIBDEPS_SHLIBEMITTER'] = partial(
+        libdeps.libdeps_emitter,
+        builder='SharedArchive',
+        visibility_map=libdeps.dependency_visibility_honored,
     )
 
 mongoEmbeddedEnv.AppendUnique(
diff --git a/src/mongo/embedded/stitch_support/SConscript b/src/mongo/embedded/stitch_support/SConscript
index c5ee25ebc6e..8ab94cb83c9 100644
--- a/src/mongo/embedded/stitch_support/SConscript
+++ b/src/mongo/embedded/stitch_support/SConscript
@@ -1,13 +1,11 @@
 # -*- mode: python; -*-
 
+from functools import partial
+import libdeps
+
 Import("env")
 Import("get_option")
 
-if get_option('build-tools') == 'next':
-    import libdeps_next as libdeps
-else:
-    import libdeps
-
 env = env.Clone()
 
 stitchSupportEnv = env.Clone()
@@ -24,9 +22,11 @@ if get_option('link-model') == 'static':
         ],
     )
 elif get_option('link-model') == 'dynamic-sdk':
-    stitchSupportEnv['LIBDEPS_SHLIBEMITTER'] = libdeps.make_libdeps_emitter(
-        'SharedArchive',
-        libdeps.dependency_visibility_honored
+    # TODO(SERVER-59134): This fails to honor the libdeps-debug flag
+    stitchSupportEnv['LIBDEPS_SHLIBEMITTER'] = partial(
+        libdeps.libdeps_emitter,
+        builder='SharedArchive',
+        visibility_map=libdeps.dependency_visibility_honored,
     )
 
 # Please see the note in ../mongo_embedded/SConscript about how to