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

Move to XCode 9.4, add CoreML and ClassKit. (#1637)

Browse Source 
* Move to XCode 9.4, add CoreML and ClassKit.

* Add assertSame and assertNotSame to stdlib.

* Fix SDK properties.
This commit is contained in:
Nikolay Igotti
2018-05-31 23:21:17 +03:00
committed by GitHub
parent f3115a100a
commit b8fa1bcdd3
7 changed files with 68 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
konan/konan.properties
+10 -10
View File
@@ -35,10 +35,10 @@ llvmVersion = 5.0.0
# Mac OS X.
llvmHome.macos_x64 = clang-llvm-5.0.0-darwin-macos
targetToolchain.macos_x64 = target-toolchain-5-macos_x64
targetToolchain.macos_x64 = target-toolchain-6-macos_x64
arch.macos_x64 = x86_64
targetSysRoot.macos_x64 = target-sysroot-5-macos_x64
targetSysRoot.macos_x64 = target-sysroot-6-macos_x64
libffiDir.macos_x64 = libffi-3.2.1-2-darwin-macos
llvmLtoFlags.macos_x64 =
llvmLtoOptFlags.macos_x64 = -O3 -function-sections
@@ -56,24 +56,24 @@ dependencies.macos_x64 = \
libffi-3.2.1-2-darwin-macos \
clang-llvm-5.0.0-darwin-macos
target-sysroot-5-macos_x64.default = \
target-sysroot-6-macos_x64.default = \
remote:internal
target-toolchain-5-macos_x64.default = \
target-toolchain-6-macos_x64.default = \
remote:internal
# Apple iOS.
targetToolchain.macos_x64-ios_arm64 = target-toolchain-5-macos_x64
targetToolchain.macos_x64-ios_arm64 = target-toolchain-6-macos_x64
dependencies.macos_x64-ios_arm64 = \
libffi-3.2.1-2-darwin-ios \
clang-llvm-5.0.0-darwin-macos
target-sysroot-5-ios_arm64.default = \
target-sysroot-6-ios_arm64.default = \
remote:internal
arch.ios_arm64 = arm64
entrySelector.ios_arm64 = -alias _Konan_main _main
targetSysRoot.ios_arm64 = target-sysroot-5-ios_arm64
targetSysRoot.ios_arm64 = target-sysroot-6-ios_arm64
libffiDir.ios_arm64 = libffi-3.2.1-2-darwin-ios
llvmLtoFlags.ios_arm64 =
llvmLtoOptFlags.ios_arm64 = -O3 -function-sections
@@ -88,17 +88,17 @@ osVersionMinFlagClang.ios_arm64 = -miphoneos-version-min
osVersionMin.ios_arm64 = 8.0
# Apple iOS simulator.
targetToolchain.macos_x64-ios_x64 = target-toolchain-5-macos_x64
targetToolchain.macos_x64-ios_x64 = target-toolchain-6-macos_x64
dependencies.macos_x64-ios_x64 = \
libffi-3.2.1-1-darwin-ios_sim \
clang-llvm-5.0.0-darwin-macos
target-sysroot-5-ios_x64.default = \
target-sysroot-6-ios_x64.default = \
remote:internal
arch.ios_x64 = x86_64
entrySelector.ios_x64 = -alias _Konan_main _main
targetSysRoot.ios_x64 = target-sysroot-5-ios_x64
targetSysRoot.ios_x64 = target-sysroot-6-ios_x64
libffiDir.ios_x64 = libffi-3.2.1-1-darwin-ios_sim
llvmLtoFlags.ios_x64 =
llvmLtoOptFlags.ios_x64 = -O3 -function-sections