Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-11-24 14:46:25 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2014-11-24 15:50:23 (GMT) |
| commit | 4421b9f37aeca8769915a3200a59b7ac45a03149 (patch) | |
| tree | ac669877a9eff8b5e6828525796f7d80ca7e6483 /BuildTools | |
| parent | 1ed9614bc04758cd393f15106ae6c1a9e13de4f5 (diff) | |
| download | swift-4421b9f37aeca8769915a3200a59b7ac45a03149.zip swift-4421b9f37aeca8769915a3200a59b7ac45a03149.tar.bz2 | |
Use the correct compiler/linker on modern iOS SDKs.
Test-Information:
Tested against iPhone/iPhoneSimulator8.1 SDKs.
Change-Id: I8837f653799587edf43885c3632b1f647832f429
Diffstat (limited to 'BuildTools')
| -rw-r--r-- | BuildTools/SCons/SConscript.boot | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot index 706c258..acd1272 100644 --- a/BuildTools/SCons/SConscript.boot +++ b/BuildTools/SCons/SConscript.boot @@ -394,8 +394,8 @@ if target in ["iphone-device", "iphone-simulator", "xcode"] : env["IPHONEOS_DEPLOYMENT_TARGET"] = "4.1" # Set the build flags - env["CC"] = "$XCODE_PLATFORM_DEVELOPER_BIN_DIR/gcc" - env["CXX"] = "$XCODE_PLATFORM_DEVELOPER_BIN_DIR/g++" + env["CC"] = os.environ["DEVELOPER_BIN_DIR"] + "/gcc" + env["CXX"] = os.environ["DEVELOPER_BIN_DIR"] + "/g++" 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"]]) |