summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-07-10 07:58:49 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-07-10 10:56:44 (GMT)
commit3911f30a92ae971aebdbf1d733b4261aafde4950 (patch)
treeeaa21ace7c329130b1aa5ab8b7494156d6eed4b9 /BuildTools/SCons
parent17721d86205828929e784ad35e5f07e8a7a71631 (diff)
downloadswift-3911f30a92ae971aebdbf1d733b4261aafde4950.zip
swift-3911f30a92ae971aebdbf1d733b4261aafde4950.tar.bz2
Fixed compilation problem on some compilers.
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r--BuildTools/SCons/SConscript.boot15
-rw-r--r--BuildTools/SCons/SConstruct9
2 files changed, 15 insertions, 9 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index c57ba3c..e969def 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -50,6 +50,7 @@ vars.Add(PathVariable("avahi_libdir", "Avahi library location", None, PathVariab
vars.Add(PathVariable("qt", "Qt location", "", PathVariable.PathAccept))
vars.Add(PathVariable("docbook_xml", "DocBook XML", None, PathVariable.PathAccept))
vars.Add(PathVariable("docbook_xsl", "DocBook XSL", None, PathVariable.PathAccept))
+vars.Add(BoolVariable("build_examples", "Build example programs", "yes"))
vars.Add(BoolVariable("enable_variants", "Build in a separate dir under build/, depending on compile flags", "no"))
################################################################################
@@ -81,12 +82,6 @@ if env["PLATFORM"] == "win32" :
env['ENV']['TMP'] = os.environ['TMP']
env.Tool("SLOCCount", toolpath = ["#/BuildTools/SCons/Tools"])
-# 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)
-
# Max out the number of jobs
if env["max_jobs"] :
try :
@@ -289,8 +284,12 @@ Export("conf_env")
variant = ""
if env["enable_variants"] :
- fingerprint = "".join([flag for flag in env["CXXFLAGS"] + env["CCFLAGS"] if not flag.startswith("-W")])
+ fingerprint = ",".join([flag for flag in env["CXXFLAGS"] + env["CCFLAGS"] if not flag.startswith("-W") and not flag.startswith("-fvisibility")])
variant = "build/" + fingerprint
-
+ if not os.path.exists(Dir("#/build").abspath) :
+ os.mkdir(Dir("#/build").abspath)
+ if os.path.exists(Dir("#/build/current").abspath) :
+ os.unlink(Dir("#/build/current").abspath)
+ os.symlink(os.path.basename(variant), Dir("#/build/current").abspath)
Return("variant")
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 :