diff options
| author | Mathew Robinson <mathew.robinson@mongodb.com> | 2019-09-05 20:38:21 +0000 |
|---|---|---|
| committer | evergreen <evergreen@mongodb.com> | 2019-09-05 20:38:21 +0000 |
| commit | 5164447331290ea11bfcad48194317517821c78c (patch) | |
| tree | cb3030f218bce205ee52e7d85d4ed3ead1d6e3db /SConstruct | |
| parent | 13a4f3e58b3ffad021e62909b7864fc06ea66012 (diff) | |
| download | mongo-5164447331290ea11bfcad48194317517821c78c.tar.gz | |
SERVER-42889 Consistently use the configure context env in doConfigure
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index bdf169e2432..4fd117320f0 100644 --- a/SConstruct +++ b/SConstruct @@ -3228,12 +3228,12 @@ def doConfigure(myenv): if ssl_provider == 'native': if conf.env.TargetOSIs('windows'): ssl_provider = 'windows' - env.SetConfigHeaderDefine("MONGO_CONFIG_SSL_PROVIDER", "MONGO_CONFIG_SSL_PROVIDER_WINDOWS") + conf.env.SetConfigHeaderDefine("MONGO_CONFIG_SSL_PROVIDER", "MONGO_CONFIG_SSL_PROVIDER_WINDOWS") conf.env.Append( MONGO_CRYPTO=["windows"] ) elif conf.env.TargetOSIs('darwin', 'macOS'): ssl_provider = 'apple' - env.SetConfigHeaderDefine("MONGO_CONFIG_SSL_PROVIDER", "MONGO_CONFIG_SSL_PROVIDER_APPLE") + conf.env.SetConfigHeaderDefine("MONGO_CONFIG_SSL_PROVIDER", "MONGO_CONFIG_SSL_PROVIDER_APPLE") conf.env.Append( MONGO_CRYPTO=["apple"] ) conf.env.AppendUnique(FRAMEWORKS=[ 'CoreFoundation', @@ -3247,7 +3247,7 @@ def doConfigure(myenv): if require_ssl: checkOpenSSL(conf) # Working OpenSSL available, use it. - env.SetConfigHeaderDefine("MONGO_CONFIG_SSL_PROVIDER", "MONGO_CONFIG_SSL_PROVIDER_OPENSSL") + conf.env.SetConfigHeaderDefine("MONGO_CONFIG_SSL_PROVIDER", "MONGO_CONFIG_SSL_PROVIDER_OPENSSL") conf.env.Append( MONGO_CRYPTO=["openssl"] ) else: @@ -3593,7 +3593,7 @@ def doConfigure(myenv): # Resolve --enable-free-mon if free_monitoring == "auto": - if 'enterprise' not in env['MONGO_MODULES']: + if 'enterprise' not in conf.env['MONGO_MODULES']: free_monitoring = "on" else: free_monitoring = "off" |