diff options
author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2018-01-29 13:12:49 -0500 |
---|---|---|
committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2018-01-29 13:12:49 -0500 |
commit | f627a7ee4e2c864013212d401aa108ad24aa9c4a (patch) | |
tree | 9dac0081448c5c4e1c554dec570e9b21b60240e6 /SConstruct | |
parent | 6b1dec440cf18fdfa9f7aa285f6f3b4fcfd1fd86 (diff) | |
download | mongo-f627a7ee4e2c864013212d401aa108ad24aa9c4a.tar.gz |
SERVER-32748 Split ssl_manager.cpp into openssl specific and general components.
Diffstat (limited to 'SConstruct')
-rw-r--r-- | SConstruct | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/SConstruct b/SConstruct index e8c2215dbdb..e77d17f4dfe 100644 --- a/SConstruct +++ b/SConstruct @@ -1766,9 +1766,11 @@ mongo_modules = moduleconfig.discover_modules('src/mongo/db/modules', get_option env['MONGO_MODULES'] = [m.name for m in mongo_modules] # --- check system --- - +ssl_provider = None + def doConfigure(myenv): global wiredtiger + global ssl_provider # Check that the compilers work. # @@ -2852,10 +2854,11 @@ def doConfigure(myenv): ssl_provider = get_option("ssl-provider") if ssl_provider == 'auto': - if conf.env.TargetOSIs('windows', 'darwin', 'macOS'): - ssl_provider = 'native' - else: - ssl_provider = 'openssl' + # TODO: When native platforms are implemented, make them the default + # if conf.env.TargetOSIs('windows', 'darwin', 'macOS'): + # ssl_provider = 'native' + # else: + ssl_provider = 'openssl' if ssl_provider == 'native': if conf.env.TargetOSIs('windows'): @@ -2881,7 +2884,8 @@ def doConfigure(myenv): # Either crypto engine is native, # or it's OpenSSL and has been checked to be working. conf.env.SetConfigHeaderDefine("MONGO_CONFIG_SSL") - + else: + ssl_provider = "none" if use_system_version_of_library("pcre"): conf.FindSysLibDep("pcre", ["pcre"]) @@ -3234,6 +3238,7 @@ Export("debugBuild optBuild") Export("wiredtiger") Export("mmapv1") Export("endian") +Export("ssl_provider") def injectMongoIncludePaths(thisEnv): thisEnv.AppendUnique(CPPPATH=['$BUILD_DIR']) |