diff options
| author | Sara Golemon <sara.golemon@mongodb.com> | 2018-01-17 21:12:15 -0500 |
|---|---|---|
| committer | Sara Golemon <sara.golemon@mongodb.com> | 2018-01-22 12:36:33 -0500 |
| commit | 625c113613331537fba18529cfc47fc9e514721b (patch) | |
| tree | 44fc126b3de41be0bf29335b8f1678b92e5d19db /SConstruct | |
| parent | bfc6cfe5fa474a48e35c6430858ae7a26a802e7b (diff) | |
| download | mongo-625c113613331537fba18529cfc47fc9e514721b.tar.gz | |
SERVER-32753 Implement basic crypto functions for OSX
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index 458bf6dfd20..fc59d5898f2 100644 --- a/SConstruct +++ b/SConstruct @@ -2854,22 +2854,25 @@ def doConfigure(myenv): # TODO: Implement native crypto for windows ssl_provider = 'openssl' elif conf.env.TargetOSIs('darwin', 'macOS'): - # TODO: Implement native crypto for apple - ssl_provider = 'openssl' + conf.env.Append( MONGO_CRYPTO=["apple"] ) + if has_option("ssl"): + # TODO: Replace SSL implementation as well. + # For now, let openssl fill that role. + checkOpenSSL(conf) if ssl_provider == 'openssl': if has_option("ssl"): checkOpenSSL(conf) # Working OpenSSL available, use it. - env.Append( MONGO_CRYPTO=["openssl"] ) + conf.env.Append( MONGO_CRYPTO=["openssl"] ) else: # If we don't need an SSL build, we can get by with TomCrypt. - env.Append( MONGO_CRYPTO=["tom"] ) + conf.env.Append( MONGO_CRYPTO=["tom"] ) if has_option( "ssl" ): # Either crypto engine is native, # or it's OpenSSL and has been checked to be working. - env.SetConfigHeaderDefine("MONGO_CONFIG_SSL") + conf.env.SetConfigHeaderDefine("MONGO_CONFIG_SSL") if use_system_version_of_library("pcre"): |