summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordreijer <dreijer@echobit.net>2010-11-12 18:33:40 (GMT)
committerKevin Smith <git@kismith.co.uk>2011-11-03 18:49:22 (GMT)
commit7b0795215f601a9561dbedbed3af32dbe9aba032 (patch)
tree554a6693de362fb3403a44a586f48865c4d949bf /BuildTools/SCons
parent16d50c0df983e96a28a6572da27b3633b40a41d7 (diff)
downloadswift-7b0795215f601a9561dbedbed3af32dbe9aba032.zip
swift-7b0795215f601a9561dbedbed3af32dbe9aba032.tar.bz2
* Added Schannel support.
License: This patch is BSD-licensed, see http://www.opensource.org/licenses/bsd-license.php
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r--BuildTools/SCons/SConstruct3
1 files changed, 3 insertions, 0 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index a7b3c78..6f4354f 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -411,6 +411,9 @@ elif env["target"] in ("iphone-device", "iphone-simulator", "xcode") :
env["HAVE_OPENSSL"] = True
else :
env["OPENSSL_FLAGS"] = ""
+ if env["PLATFORM"] == "win32" :
+ # If we're compiling for Windows and OpenSSL isn't being used, use Schannel
+ env.Append(LIBS = ["secur32"])
openssl_conf.Finish()