summaryrefslogtreecommitdiff
path: root/src/mongo/embedded/stitch_support
diff options
context:
space:
mode:
authorAndrew Morrow <acm@mongodb.com>2021-08-04 17:11:45 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-08-05 17:15:53 +0000
commit9843f3225d95fb9171b3cb27e23fcc4fa49d2043 (patch)
tree78326dd78a83e43d743b0761b43af10010e94a1c /src/mongo/embedded/stitch_support
parentf5c22de9c82a65e228b1c271a933dcaeeae8c074 (diff)
downloadmongo-9843f3225d95fb9171b3cb27e23fcc4fa49d2043.tar.gz
SERVER-56580 Promote build-tools=next to stable
Diffstat (limited to 'src/mongo/embedded/stitch_support')
-rw-r--r--src/mongo/embedded/stitch_support/SConscript16
1 files changed, 8 insertions, 8 deletions
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