azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Xcode-bundled SDKs for macOS, iOS and iOS simulator targets

Browse Source 
Also
* Update macOS SDK to 10.13
* Update iOS SDK to 11.2
* Enable iOS simulator support
* Disable tetris on iOS as we don't provide SDL2 in sysroot anymore
This commit is contained in:
Svyatoslav Scherbina
2017-12-08 14:16:32 +03:00
committed by SvyatoslavScherbina
parent 905390cd45
commit 07fce11780
62 changed files with 123 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/LinkStage.kt
+1 -2
View File
@@ -121,8 +121,7 @@ internal open class AndroidPlatform(distribution: Distribution)
internal open class MacOSBasedPlatform(distribution: Distribution)
: PlatformFlags(distribution.targetProperties) {
// TODO: move 'ld' out of the host sysroot, as it doesn't belong here.
private val linker = "${distribution.hostSysRoot}/usr/bin/ld"
private val linker = "$targetToolchain/usr/bin/ld"
internal val dsymutil = "${distribution.llvmBin}/llvm-dsymutil"
internal val libLTO = distribution.libLTO
backend.native/konan.properties
+42 -16
View File
@@ -33,10 +33,10 @@ llvmVersion = 5.0.0
# Mac OS X.
llvmHome.osx = clang-llvm-5.0.0-darwin-macos
targetToolchain.osx = clang-llvm-5.0.0-darwin-macos
targetToolchain.osx = target-toolchain-1-osx
arch.osx = x86_64
targetSysRoot.osx = target-sysroot-1-darwin-macos
targetSysRoot.osx = target-sysroot-2-darwin-macos
libffiDir.osx = libffi-3.2.1-2-darwin-macos
llvmLtoFlags.osx =
llvmLtoOptFlags.osx = -O3 -function-sections
@@ -50,20 +50,39 @@ osVersionMinFlagLd.osx = -macosx_version_min
osVersionMinFlagClang.osx = -mmacosx-version-min
osVersionMin.osx = 10.11
entrySelector.osx = -alias _Konan_main _main
dependencies.osx = target-sysroot-1-darwin-macos \
dependencies.osx = target-sysroot-2-darwin-macos \
libffi-3.2.1-2-darwin-macos \
clang-llvm-5.0.0-darwin-macos
clang-llvm-5.0.0-darwin-macos \
target-toolchain-1-osx
target-sysroot-2-darwin-macos.default = \
remote:internal \
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk
target-sysroot-2-darwin-macos.alt = \
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
target-toolchain-1-osx.default = \
remote:internal \
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain
# Apple iOS.
targetToolchain.osx-ios = clang-llvm-5.0.0-darwin-macos
dependencies.osx-ios = target-sysroot-1-darwin-macos \
targetToolchain.osx-ios = target-toolchain-1-osx
dependencies.osx-ios = target-toolchain-1-osx \
libffi-3.2.1-2-darwin-ios \
clang-llvm-5.0.0-darwin-macos \
target-sysroot-2-darwin-ios
target-sysroot-3-darwin-ios
target-sysroot-3-darwin-ios.default = \
remote:internal \
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.2.sdk
target-sysroot-3-darwin-ios.alt = \
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk
arch.ios = arm64
entrySelector.ios = -alias _Konan_main _main
targetSysRoot.ios = target-sysroot-2-darwin-ios
targetSysRoot.ios = target-sysroot-3-darwin-ios
libffiDir.ios = libffi-3.2.1-2-darwin-ios
llvmLtoFlags.ios =
llvmLtoOptFlags.ios = -O3 -function-sections
@@ -71,28 +90,35 @@ linkerNoDebugFlags.ios = -S
linkerDynamicFlags.ios = -S -dylib
llvmLtoNooptFlags.ios = -O1
llvmLtoDynamicFlags.ios = -relocation-model=pic
linkerKonanFlags.ios = -lc++ -lobjc -framework Foundation -sdk_version 10.2
linkerKonanFlags.ios = -lc++ -lobjc -framework Foundation -sdk_version 11.2
linkerOptimizationFlags.ios = -dead_strip
osVersionMinFlagLd.ios = -iphoneos_version_min
osVersionMinFlagClang.ios = -miphoneos-version-min
osVersionMin.ios = 8.0
# Apple iOS simulator.
targetToolchain.osx-ios_sim = clang-llvm-5.0.0-darwin-macos
dependencies.osx-ios_sim = target-sysroot-1-darwin-macos \
libffi-3.2.1-2-darwin-ios_sim \
targetToolchain.osx-ios_sim = target-toolchain-1-osx
dependencies.osx-ios_sim = target-toolchain-1-osx \
libffi-3.2.1-1-darwin-ios_sim \
clang-llvm-5.0.0-darwin-macos \
target-sysroot-1-darwin-ios_sim
target-sysroot-2-darwin-ios_sim
target-sysroot-2-darwin-ios_sim.default = \
remote:internal \
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator11.2.sdk
target-sysroot-2-darwin-ios_sim.alt = \
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk
arch.ios_sim = x86_64
entrySelector.ios_sim = -alias _Konan_main _main
targetSysRoot.ios_sim = target-sysroot-1-darwin-ios-sim
libffiDir.ios_sim = libffi-3.2.1-2-darwin-ios-sim
targetSysRoot.ios_sim = target-sysroot-2-darwin-ios_sim
libffiDir.ios_sim = libffi-3.2.1-1-darwin-ios_sim
llvmLtoFlags.ios_sim =
llvmLtoOptFlags.ios_sim = -O3 -function-sections
llvmLtoNooptFlags.ios_sim = -O1
llvmLtoDynamicFlags.ios_sim = -relocation-model=pic
linkerKonanFlags.ios_sim = -lc++ -lobjc -framework Foundation -sdk_version 10.2
linkerKonanFlags.ios_sim = -lc++ -lobjc -framework Foundation -sdk_version 11.2
linkerOptimizationFlags.ios_sim = -dead_strip
linkerNoDebugFlags.ios_sim = -S
linkerDynamicFlags.ios_sim = -S -dylib