summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2013-11-07 08:56:34 (GMT)
committerKevin Smith <git@kismith.co.uk>2013-11-07 08:58:37 (GMT)
commitef23f6f50352dc24db7ddea07d3a90c1637d7369 (patch)
tree2ab1398e6c851f139f1b18862ce02825bc15fd2a /BuildTools/SCons
parent3bc61625ba94ff532ef02de7872a4cf49be49d59 (diff)
downloadswift-ef23f6f50352dc24db7ddea07d3a90c1637d7369.zip
swift-ef23f6f50352dc24db7ddea07d3a90c1637d7369.tar.bz2
Get past the configure stage for iOS-based xcode targets
Without telling the linker that it's for iOS, you get link errors during configure, like: ld: building for MacOSX, but linking against dylib built for iOS Simulator file '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator7.0.sdk/System/Library/Frameworks/Foundation.framework/Foundation' for architecture i386 Change-Id: I446bc99d5b8a2ba95a441e9ac0b82d6b64ff3d83
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r--BuildTools/SCons/SConscript.boot1
1 files changed, 1 insertions, 0 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index 3a0551c..6a115d6 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -354,6 +354,7 @@ if target in ["iphone-device", "iphone-simulator", "xcode"] :
env["OBJCCFLAGS"] = ["-fobjc-abi-version=2", "-fobjc-legacy-dispatch"]
env["LD"] = env["CC"]
env.Append(CCFLAGS = env["XCODE_ARCH_FLAGS"] + ["-fvisibility=hidden", "-miphoneos-version-min=" + env["IPHONEOS_DEPLOYMENT_TARGET"]])
+ env.Append(LINKFLAGS = "-miphoneos-version-min=" + env["IPHONEOS_DEPLOYMENT_TARGET"])
if os.environ.get("GCC_THUMB_SUPPORT", False) :
env.Append(CCFLAGS = ["-mthumb"])
env.Append(LINKFLAGS = env["XCODE_ARCH_FLAGS"])