Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2013-05-10 19:47:26 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2013-05-10 19:47:26 (GMT) |
| commit | 0c95687ba9e513ec916a542282cbe900eda42a80 (patch) | |
| tree | d6a0845e9ae25b0ba93fab5c5ac2a1fc353f3635 /BuildTools/SCons | |
| parent | c5e2b1bdeac11b6307a57225b93fa9c508d86c48 (diff) | |
| download | swift-0c95687ba9e513ec916a542282cbe900eda42a80.zip swift-0c95687ba9e513ec916a542282cbe900eda42a80.tar.bz2 | |
Xcode SDK location changes.
Change-Id: Ib13d3eaa927431e3a10f3b724fbfab96f134c1c8
Diffstat (limited to 'BuildTools/SCons')
| -rw-r--r-- | BuildTools/SCons/SConscript.boot | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot index 97a4387..89b8166 100644 --- a/BuildTools/SCons/SConscript.boot +++ b/BuildTools/SCons/SConscript.boot @@ -118,7 +118,7 @@ if env["max_jobs"] : pass # Set the default compiler to CLang on OS X, and set the necessary flags -if env["PLATFORM"] == "darwin" : +if env["PLATFORM"] == "darwin" and env["target"] == "native" : if "cc" not in env : env["CC"] = "clang" if platform.machine() == "x86_64" : @@ -312,15 +312,15 @@ if target in ["iphone-device", "iphone-simulator", "xcode"] : env['CXXCOM'] = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM ${SOURCES.abspath}' else : # Hard code values - env["XCODE_PLATFORM_DEVELOPER_BIN_DIR"] = "/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin" + env["XCODE_PLATFORM_DEVELOPER_BIN_DIR"] = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin" if target == "iphone-device": env["XCODE_ARCH_FLAGS"] = ["-arch", "armv6", "-arch", "armv7"] sdkPart = "iPhoneOS" else : env["XCODE_ARCH_FLAGS"] = ["-arch", "i386"] sdkPart = "iPhoneSimulator" - sdkVer = "4.3" - env["XCODE_SDKROOT"] = "/Developer/Platforms/" + sdkPart + ".platform/Developer/SDKs/" + sdkPart + sdkVer + ".sdk" + sdkVer = "6.0" + env["XCODE_SDKROOT"] = "/Applications/Xcode.app/Contents/Developer/Platforms/" + sdkPart + ".platform/Developer/SDKs/" + sdkPart + sdkVer + ".sdk" env["IPHONEOS_DEPLOYMENT_TARGET"] = "4.1" # Set the build flags |