summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2012-08-30 18:56:46 (GMT)
committerTobias Markmann <tm@ayena.de>2012-08-30 18:56:46 (GMT)
commit49aa0ddd615ac5694cec69e380ce3773a1fe32ed (patch)
tree63714caffacba172f3e71724d7d145a525b31ad9 /BuildTools
parent6856199274e9c5e581220fccf520b8f011519d17 (diff)
downloadswift-contrib-tobias/cocoa-ssl.zip
swift-contrib-tobias/cocoa-ssl.tar.bz2
Dummy SecureTransport TLS backend. Mostly scons integration fail.tobias/cocoa-ssl
Diffstat (limited to 'BuildTools')
-rw-r--r--BuildTools/SCons/SConstruct6
1 files changed, 5 insertions, 1 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index cd7a25a..0c2779a 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -428,6 +428,10 @@ if use_openssl and openssl_conf.CheckCHeader("openssl/ssl.h") :
if env["PLATFORM"] == "darwin" :
if platform.mac_ver()[0].startswith("10.5") :
env["OPENSSL_FLAGS"]["FRAMEWORKS"] = ["Security"]
+elif env["target"] in ("xcode"):
+ env["HAVE_SECURETRANSPORT"] = True
+ env["SECURETRANSPORT_FLAGS"]["FRAMEWORKS"] = ["Security"]
+ #env["SECURETRANSPORT_FLAGS"]["CPPPATH"] = [""]
elif env["target"] in ("iphone-device", "iphone-simulator", "xcode") :
env["OPENSSL_BUNDLED"] = True
env["HAVE_OPENSSL"] = True
@@ -571,6 +575,6 @@ print " Projects: " + ' '.join(env["PROJECTS"])
print ""
print " XML Parsers: " + ' '.join(parsers)
-print " TLS Support: " + ("OpenSSL" if env.get("HAVE_OPENSSL",0) else ("Schannel" if env.get("HAVE_SCHANNEL", 0) else "Disabled"))
+print " TLS Support: " + ("OpenSSL" if env.get("HAVE_OPENSSL",0) else ("Schannel" if env.get("HAVE_SCHANNEL", 0) else ("SecureTransport" if env.get("HAVE_SECURETRANSPORT", 0) else "Disabled")))
print " DNSSD Support: " + ("Bonjour" if env.get("HAVE_BONJOUR") else ("Avahi" if env.get("HAVE_AVAHI") else "Disabled"))
print