diff options
| author | Andrew Morrow <acm@mongodb.com> | 2020-02-21 08:04:47 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-02-21 17:55:11 +0000 |
| commit | 82cf48411f7c6faee2d3dabcce8bb168542dacc2 (patch) | |
| tree | 8e5f9c2673d6eec0706cd7755b0198cf1e682ebb /SConstruct | |
| parent | 65814eb5977210dc46956c403a29445bab95a25b (diff) | |
| download | mongo-82cf48411f7c6faee2d3dabcce8bb168542dacc2.tar.gz | |
SERVER-27675 Make all targets depend on the allocator shim to topsort it last
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/SConstruct b/SConstruct index c8217f1479f..9b97b705b30 100644 --- a/SConstruct +++ b/SConstruct @@ -1405,15 +1405,6 @@ if use_libunwind == True: if env.TargetOSIs('windows') and link_model not in ['object', 'static', 'dynamic-sdk']: env.FatalError("Windows builds must use the 'object', 'dynamic-sdk', or 'static' link models") - -# The mongodbtoolchain currently doesn't produce working binaries if -# you combine a dynamic build with a non-system allocator, but the -# failure mode is non-obvious. For now, prevent people from wandering -# inadvertantly into this trap. Remove this constraint when -# https://jira.mongodb.org/browse/SERVER-27675 is resolved. -if (link_model == 'dynamic') and ('mongodbtoolchain' in env['CXX']) and (env['MONGO_ALLOCATOR'] != 'system'): - env.FatalError('Cannot combine the MongoDB toolchain, a dynamic build, and a non-system allocator. Choose two.') - # The 'object' mode for libdeps is enabled by setting _LIBDEPS to $_LIBDEPS_OBJS. The other two # modes operate in library mode, enabled by setting _LIBDEPS to $_LIBDEPS_LIBS. env['_LIBDEPS'] = '$_LIBDEPS_OBJS' if link_model == "object" else '$_LIBDEPS_LIBS' |