summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-10-11 20:17:01 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-10-11 20:17:40 (GMT)
commit004c28314cd6a40ec062d35214daba3b3436bfd7 (patch)
treeb71e26415cd27616a73d8a572a092e4b07fd5671
parent3dc6eb8466becce591af497b0bd29fa44760e64c (diff)
downloadswift-004c28314cd6a40ec062d35214daba3b3436bfd7.zip
swift-004c28314cd6a40ec062d35214daba3b3436bfd7.tar.bz2
Add temporary workaround to build against OS X 10.6 SDKs.
-rw-r--r--BuildTools/SCons/SConscript.boot14
1 files changed, 14 insertions, 0 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index 64cdb63..361004f 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -30,6 +30,7 @@ if os.name == "posix" :
if os.name == "mac" or (os.name == "posix" and os.uname()[0] == "Darwin"):
vars.Add(BoolVariable("universal", "Create universal binaries", "no"))
vars.Add(BoolVariable("mac105", "Link against the 10.5 frameworks", "no"))
+ vars.Add(BoolVariable("mac106", "Link against the 10.6 frameworks", "no"))
if os.name == "nt" :
vars.Add(PathVariable("vcredist", "MSVC redistributable dir", None, PathVariable.PathAccept))
if os.name == "nt" :
@@ -171,6 +172,9 @@ if env.get("universal", 0) :
"-arch", "i386",
"-arch", "ppc"])
+
+# Link against other versions of the OS X SDKs.
+# FIXME: This method does not work anymore, we need to set deployment targets.
if env.get("mac105", 0) :
assert(env["PLATFORM"] == "darwin")
env.Append(CCFLAGS = [
@@ -181,6 +185,16 @@ if env.get("mac105", 0) :
"-isysroot", "/Developer/SDKs/MacOSX10.5.sdk",
"-arch", "i386"])
env.Append(FRAMEWORKS = ["Security"])
+if env.get("mac106", 0) :
+ assert(env["PLATFORM"] == "darwin")
+ env.Append(CCFLAGS = [
+ "-isysroot", "/Developer/SDKs/MacOSX10.6.sdk",
+ "-arch", "i386"])
+ env.Append(LINKFLAGS = [
+ "-mmacosx-version-min=10.6",
+ "-isysroot", "/Developer/SDKs/MacOSX10.6.sdk",
+ "-arch", "i386"])
+ env.Append(FRAMEWORKS = ["Security"])
if not env["assertions"] :
env.Append(CPPDEFINES = ["NDEBUG"])