diff options
| author | Henrik Edin <henrik.edin@mongodb.com> | 2019-06-18 15:36:27 -0400 |
|---|---|---|
| committer | Henrik Edin <henrik.edin@mongodb.com> | 2019-06-26 10:16:18 -0400 |
| commit | c13867166ddb658f417bbaed7c2181107d32463a (patch) | |
| tree | 909c37282ccd5efab3f6f711ec3fce3df4a357f5 /SConstruct | |
| parent | abf661c2657e08a53c4fd13d939b4587ddaf734d (diff) | |
| download | mongo-c13867166ddb658f417bbaed7c2181107d32463a.tar.gz | |
SERVER-41815 Make dynamic runtime default on Windows and remove --dynamic-windows option
(cherry picked from commit 5d5880c21a40ea6cb2b2c9d151d63cad675a3fca)
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/SConstruct b/SConstruct index 3ceddb572fc..7ebbcbcc344 100644 --- a/SConstruct +++ b/SConstruct @@ -128,11 +128,6 @@ add_option('lto', nargs=0, ) -add_option('dynamic-windows', - help='dynamically link on Windows', - nargs=0, -) - add_option('endian', choices=['big', 'little', 'auto'], default='auto', @@ -1609,8 +1604,6 @@ elif env.TargetOSIs('openbsd'): env.Append( LIBS=[ "kvm" ] ) elif env.TargetOSIs('windows'): - dynamicCRT = has_option("dynamic-windows") - env['DIST_ARCHIVE_SUFFIX'] = '.zip' # If tools configuration fails to set up 'cl' in the path, fall back to importing the whole @@ -1755,20 +1748,9 @@ elif env.TargetOSIs('windows'): env.Append( LINKFLAGS=["/DEBUG"] ) # /MD: use the multithreaded, DLL version of the run-time library (MSVCRT.lib/MSVCR###.DLL) - # /MT: use the multithreaded, static version of the run-time library (LIBCMT.lib) # /MDd: Defines _DEBUG, _MT, _DLL, and uses MSVCRTD.lib/MSVCRD###.DLL - # /MTd: Defines _DEBUG, _MT, and causes your application to use the - # debug multithread version of the run-time library (LIBCMTD.lib) - - winRuntimeLibMap = { - #dyn #dbg - ( False, False ) : "/MT", - ( False, True ) : "/MTd", - ( True, False ) : "/MD", - ( True, True ) : "/MDd", - } - env.Append(CCFLAGS=[winRuntimeLibMap[(dynamicCRT, debugBuild)]]) + env.Append(CCFLAGS=["/MDd" if debugBuild else "/MD"]) if optBuild: # /O1: optimize for size |