Skip to content

Commit 72023b8

Browse files
committed
CXX-928 Fix bad merge of SConstruct in dc6e44b
1 parent 53bbe81 commit 72023b8

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

SConstruct

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1734,7 +1734,8 @@ def doConfigure(myenv):
17341734

17351735
conf = Configure(myenv)
17361736

1737-
if has_option( "ssl" ):
1737+
conf.env["MONGO_SSL"] = bool(has_option("ssl"))
1738+
if conf.env["MONGO_SSL"]:
17381739
sslLibName = "ssl"
17391740
cryptoLibName = "crypto"
17401741
if windows:
@@ -1784,8 +1785,6 @@ def doConfigure(myenv):
17841785
if not conf.CheckLinkSSL():
17851786
conf.env.ConfError("SSL is enabled, but is unavailable")
17861787

1787-
conf.env["MONGO_SSL"] = True
1788-
17891788
if conf.CheckDeclaration(
17901789
"FIPS_mode_set",
17911790
includes="""

0 commit comments

Comments
 (0)