summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2011-11-03 18:52:03 (GMT)
committerKevin Smith <git@kismith.co.uk>2011-11-03 20:54:36 (GMT)
commit7a26e76bd05283fcc329469d25a2640107966603 (patch)
tree6aaab1a11cc344d5dd59302450ba70c350963847 /BuildTools/SCons
parent7b0795215f601a9561dbedbed3af32dbe9aba032 (diff)
downloadswift-contrib-7a26e76bd05283fcc329469d25a2640107966603.zip
swift-contrib-7a26e76bd05283fcc329469d25a2640107966603.tar.bz2
Quick brush up after previous patch.
Includes: Initial cleanup of SChannel code; compiling on non-Windows Be willing to compile Swift with SChannel Undo some (presumably accidental) OpenSSL changes Where TLS doesn't support finish messages (SChannel), don't try -PLUS
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r--BuildTools/SCons/SConstruct1
1 files changed, 1 insertions, 0 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index 6f4354f..b3d3c8f 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -412,6 +412,7 @@ elif env["target"] in ("iphone-device", "iphone-simulator", "xcode") :
else :
env["OPENSSL_FLAGS"] = ""
if env["PLATFORM"] == "win32" :
+ env["HAVE_SCHANNEL"] = True
# If we're compiling for Windows and OpenSSL isn't being used, use Schannel
env.Append(LIBS = ["secur32"])