summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorMark Benvenuto <mark.benvenuto@mongodb.com>2018-01-29 15:42:29 -0500
committerMark Benvenuto <mark.benvenuto@mongodb.com>2018-01-29 15:42:29 -0500
commit494dbd00897e82e786c21bb37c5048bc4b8beadb (patch)
treec7b118dc02534cef9bb7b279590b7cfc9f940c01 /SConstruct
parentf570dd0e7d18971533dfb5cf85eeb753708d628d (diff)
downloadmongo-494dbd00897e82e786c21bb37c5048bc4b8beadb.tar.gz
Revert "SERVER-32748 Split ssl_manager.cpp into openssl specific and general components."
This reverts commit f627a7ee4e2c864013212d401aa108ad24aa9c4a.
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct17
1 files changed, 6 insertions, 11 deletions
diff --git a/SConstruct b/SConstruct
index e77d17f4dfe..e8c2215dbdb 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1766,11 +1766,9 @@ 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.
#
@@ -2854,11 +2852,10 @@ def doConfigure(myenv):
ssl_provider = get_option("ssl-provider")
if ssl_provider == 'auto':
- # 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 conf.env.TargetOSIs('windows', 'darwin', 'macOS'):
+ ssl_provider = 'native'
+ else:
+ ssl_provider = 'openssl'
if ssl_provider == 'native':
if conf.env.TargetOSIs('windows'):
@@ -2884,8 +2881,7 @@ 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"])
@@ -3238,7 +3234,6 @@ Export("debugBuild optBuild")
Export("wiredtiger")
Export("mmapv1")
Export("endian")
-Export("ssl_provider")
def injectMongoIncludePaths(thisEnv):
thisEnv.AppendUnique(CPPPATH=['$BUILD_DIR'])