Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-07-10 07:58:49 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-07-10 10:56:44 (GMT) |
| commit | 3911f30a92ae971aebdbf1d733b4261aafde4950 (patch) | |
| tree | eaa21ace7c329130b1aa5ab8b7494156d6eed4b9 /BuildTools/SCons/SConstruct | |
| parent | 17721d86205828929e784ad35e5f07e8a7a71631 (diff) | |
| download | swift-contrib-3911f30a92ae971aebdbf1d733b4261aafde4950.zip swift-contrib-3911f30a92ae971aebdbf1d733b4261aafde4950.tar.bz2 | |
Fixed compilation problem on some compilers.
Diffstat (limited to 'BuildTools/SCons/SConstruct')
| -rw-r--r-- | BuildTools/SCons/SConstruct | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index 90ea403..cc052ca 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -5,6 +5,13 @@ Import("env", "conf_env") root = Dir("../..").abspath +# Override SConscript to handle tests +oldSConscript = SConscript +def SConscript(*arguments, **keywords) : + if not keywords.get("test_only", False) or env["TEST"] : + return apply(oldSConscript, arguments, keywords) +env.SConscript = SConscript + ################################################################################ # Extend the default build environment (not affecting the configure env) # @@ -375,7 +382,7 @@ 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 target in ("iphone-device", "iphone-simulator", "xcode") : +elif env["target"] in ("iphone-device", "iphone-simulator", "xcode") : env["OPENSSL_BUNDLED"] = True env["HAVE_OPENSSL"] = True else : |