diff options
Diffstat (limited to 'src/mongo/embedded')
| -rw-r--r-- | src/mongo/embedded/SConscript | 13 | ||||
| -rw-r--r-- | src/mongo/embedded/mongo_embedded/SConscript | 28 | ||||
| -rw-r--r-- | src/mongo/embedded/mongoc_embedded/SConscript | 31 | ||||
| -rw-r--r-- | src/mongo/embedded/stitch_support/SConscript | 24 |
4 files changed, 39 insertions, 57 deletions
diff --git a/src/mongo/embedded/SConscript b/src/mongo/embedded/SConscript index 879b5033969..b4243ca1ebf 100644 --- a/src/mongo/embedded/SConscript +++ b/src/mongo/embedded/SConscript @@ -8,15 +8,14 @@ Import("wiredtiger") env = env.Clone() -env.AppendUnique( - CPPPATH=["$BUILD_DIR/mongo/embedded"], -) +env.AppendUnique(CPPPATH=["$BUILD_DIR/mongo/embedded"], ) # Inject this before we call the SDK directory SConscripts so that # they can both use it. sdkEnv = env.Clone() + def mongo_export_file_generator(target, source, env, for_signature): if env.ToolchainIs('msvc'): script = env.File(env.subst("${TARGET.base}.def", target=target)) @@ -30,6 +29,7 @@ def mongo_export_file_generator(target, source, env, for_signature): else: pass + # We really only want to use the mapfile if we are doing an SDK build. In an ordinary # dynamic build, we would end up building the normal library with an export map # but many of its symbols should in fact be coming from other libraries, and we @@ -44,7 +44,7 @@ env.SConscript( 'stitch_support', ], exports={ - 'env' : sdkEnv, + 'env': sdkEnv, }, ) @@ -116,8 +116,9 @@ env.Library( '$BUILD_DIR/mongo/db/vector_clock_trivial', '$BUILD_DIR/mongo/db/wire_version', '$BUILD_DIR/mongo/rpc/client_metadata', - '$BUILD_DIR/mongo/util/latch_analyzer' if get_option('use-diagnostic-latches') == 'on' else [], + '$BUILD_DIR/mongo/util/latch_analyzer' + if get_option('use-diagnostic-latches') == 'on' else [], '$BUILD_DIR/mongo/util/options_parser/options_parser', '$BUILD_DIR/mongo/util/version_impl', - ] + ], ) diff --git a/src/mongo/embedded/mongo_embedded/SConscript b/src/mongo/embedded/mongo_embedded/SConscript index 8f84ee065d5..39336394eba 100644 --- a/src/mongo/embedded/mongo_embedded/SConscript +++ b/src/mongo/embedded/mongo_embedded/SConscript @@ -19,18 +19,14 @@ env.AutoInstall( ) mongoEmbeddedEnv = env.Clone() -mongoEmbeddedEnv.AppendUnique( - CPPDEFINES=[ - 'MONGO_EMBEDDED_COMPILING', - ], -) +mongoEmbeddedEnv.AppendUnique(CPPDEFINES=[ + 'MONGO_EMBEDDED_COMPILING', +], ) if get_option('link-model') == 'static': - mongoEmbeddedEnv.AppendUnique( - CPPDEFINES=[ - 'MONGO_EMBEDDED_STATIC', - ], - ) + mongoEmbeddedEnv.AppendUnique(CPPDEFINES=[ + 'MONGO_EMBEDDED_STATIC', + ], ) elif get_option('link-model') == 'dynamic-sdk': # TODO(SERVER-59134): This fails to honor the libdeps-debug flag mongoEmbeddedEnv['LIBDEPS_SHLIBEMITTER'] = partial( @@ -39,11 +35,9 @@ elif get_option('link-model') == 'dynamic-sdk': visibility_map=libdeps.dependency_visibility_honored, ) -mongoEmbeddedEnv.AppendUnique( - SHLINKFLAGS=[ - '$MONGO_EXPORT_FILE_SHLINKFLAGS', - ], -) +mongoEmbeddedEnv.AppendUnique(SHLINKFLAGS=[ + '$MONGO_EXPORT_FILE_SHLINKFLAGS', +], ) if mongoEmbeddedEnv.TargetOSIs('darwin'): # The current version and compatibility are the *minor* ABI @@ -57,9 +51,7 @@ if mongoEmbeddedEnv.TargetOSIs('darwin'): SHLINKFLAGS=[ '-Wl,-current_version,1', '-Wl,-compatibility_version,1', - ], - ) - + ], ) mongoEmbeddedTargets = mongoEmbeddedEnv.Library( target='mongo_embedded', diff --git a/src/mongo/embedded/mongoc_embedded/SConscript b/src/mongo/embedded/mongoc_embedded/SConscript index 69b5d150b20..57cead4cc65 100644 --- a/src/mongo/embedded/mongoc_embedded/SConscript +++ b/src/mongo/embedded/mongoc_embedded/SConscript @@ -18,33 +18,29 @@ env.AutoInstall( AIB_ROLE='base', ) + def create_mongoc_env(env): mongocEnv = env.Clone() mongocEnv.AppendUnique(LIBS=['bson-1.0', 'mongoc-1.0']) return mongocEnv + mongocEmbeddedEnv = create_mongoc_env(env) -mongocEmbeddedEnv.AppendUnique( - CPPDEFINES=[ - 'MONGOC_EMBEDDED_COMPILING', - ], -) +mongocEmbeddedEnv.AppendUnique(CPPDEFINES=[ + 'MONGOC_EMBEDDED_COMPILING', +], ) if get_option('link-model') == 'static': - mongocEmbeddedEnv.AppendUnique( - CPPDEFINES=[ - 'MONGOC_EMBEDDED_STATIC', - ], - ) + mongocEmbeddedEnv.AppendUnique(CPPDEFINES=[ + 'MONGOC_EMBEDDED_STATIC', + ], ) # Please see the note in ../mongo_embedded/SConscript about how to # interpret and adjust the current and compatibility versinos. -mongocEmbeddedEnv.AppendUnique( - SHLINKFLAGS=[ - '$MONGO_EXPORT_FILE_SHLINKFLAGS', - ], -) +mongocEmbeddedEnv.AppendUnique(SHLINKFLAGS=[ + '$MONGO_EXPORT_FILE_SHLINKFLAGS', +], ) if mongocEmbeddedEnv.TargetOSIs('darwin'): # Please see the note in ../mongo_embedded/SConscript about how to @@ -53,8 +49,7 @@ if mongocEmbeddedEnv.TargetOSIs('darwin'): SHLINKFLAGS=[ '-Wl,-current_version,1', '-Wl,-compatibility_version,1', - ], - ) + ], ) mongocEmbeddedTargets = mongocEmbeddedEnv.Library( target='mongoc_embedded', @@ -72,7 +67,7 @@ env.AutoInstall( '$PREFIX_INCLUDEDIR/mongoc_embedded/v1/mongoc_embedded', source=['mongoc_embedded.h'], AIB_COMPONENT='embedded', - AIB_ROLE='dev' + AIB_ROLE='dev', ) yamlEnv = env.Clone() diff --git a/src/mongo/embedded/stitch_support/SConscript b/src/mongo/embedded/stitch_support/SConscript index 8ab94cb83c9..63e178ea475 100644 --- a/src/mongo/embedded/stitch_support/SConscript +++ b/src/mongo/embedded/stitch_support/SConscript @@ -9,18 +9,14 @@ Import("get_option") env = env.Clone() stitchSupportEnv = env.Clone() -stitchSupportEnv.AppendUnique( - CPPDEFINES=[ - 'STITCH_SUPPORT_COMPILING', - ], -) +stitchSupportEnv.AppendUnique(CPPDEFINES=[ + 'STITCH_SUPPORT_COMPILING', +], ) if get_option('link-model') == 'static': - stitchSupportEnv.AppendUnique( - CPPDEFINES=[ - 'STITCH_SUPPORT_STATIC', - ], - ) + stitchSupportEnv.AppendUnique(CPPDEFINES=[ + 'STITCH_SUPPORT_STATIC', + ], ) elif get_option('link-model') == 'dynamic-sdk': # TODO(SERVER-59134): This fails to honor the libdeps-debug flag stitchSupportEnv['LIBDEPS_SHLIBEMITTER'] = partial( @@ -31,11 +27,9 @@ elif get_option('link-model') == 'dynamic-sdk': # Please see the note in ../mongo_embedded/SConscript about how to # interpret and adjust the current and compatibility versions. -stitchSupportEnv.AppendUnique( - SHLINKFLAGS=[ - '$MONGO_EXPORT_FILE_SHLINKFLAGS', - ], -) +stitchSupportEnv.AppendUnique(SHLINKFLAGS=[ + '$MONGO_EXPORT_FILE_SHLINKFLAGS', +], ) stitchSupportTargets = stitchSupportEnv.Library( target='stitch_support', |