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

Update to Xcode 10.0 (#2078)

Browse Source 
* Update to Xcode 10.0

* Promote iOS version to 9.0
This commit is contained in:
Nikolay Igotti
2018-09-18 13:51:48 +03:00
committed by GitHub
parent 866f137317
commit 0165e96b8e
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
konan/konan.properties
+15 -15
View File
@@ -35,10 +35,10 @@ llvmVersion = 6.0.1
# Mac OS X. # Mac OS X.
llvmHome.macos_x64 = clang-llvm-6.0.1-darwin-macos llvmHome.macos_x64 = clang-llvm-6.0.1-darwin-macos
targetToolchain.macos_x64 = target-toolchain-6-macos_x64 targetToolchain.macos_x64 = target-toolchain-7-macos_x64
arch.macos_x64 = x86_64 arch.macos_x64 = x86_64
targetSysRoot.macos_x64 = target-sysroot-6-macos_x64 targetSysRoot.macos_x64 = target-sysroot-7-macos_x64
libffiDir.macos_x64 = libffi-3.2.1-2-darwin-macos libffiDir.macos_x64 = libffi-3.2.1-2-darwin-macos
llvmLtoFlags.macos_x64 = llvmLtoFlags.macos_x64 =
llvmLtoOptFlags.macos_x64 = -O3 -function-sections llvmLtoOptFlags.macos_x64 = -O3 -function-sections
@@ -56,25 +56,25 @@ dependencies.macos_x64 = \
libffi-3.2.1-2-darwin-macos \ libffi-3.2.1-2-darwin-macos \
clang-llvm-6.0.1-darwin-macos clang-llvm-6.0.1-darwin-macos
target-sysroot-6-macos_x64.default = \ target-sysroot-7-macos_x64.default = \
remote:internal remote:internal
target-toolchain-6-macos_x64.default = \ target-toolchain-7-macos_x64.default = \
remote:internal remote:internal
# Apple's 32-bit iOS. # Apple's 32-bit iOS.
targetToolchain.macos_x64-ios_arm32 = target-toolchain-6-macos_x64 targetToolchain.macos_x64-ios_arm32 = target-toolchain-7-macos_x64
dependencies.macos_x64-ios_arm32 = \ dependencies.macos_x64-ios_arm32 = \
libffi-3.2.1-2-darwin-ios \ libffi-3.2.1-2-darwin-ios \
clang-llvm-6.0.1-darwin-macos clang-llvm-6.0.1-darwin-macos
target-sysroot-6-ios_arm32.default = \ target-sysroot-7-ios_arm32.default = \
remote:internal remote:internal
arch.ios_arm32 = armv7 arch.ios_arm32 = armv7
entrySelector.ios_arm32 = -alias _Konan_main _main entrySelector.ios_arm32 = -alias _Konan_main _main
# Shared with 64-bit version. # Shared with 64-bit version.
targetSysRoot.ios_arm32 = target-sysroot-6-ios_arm64 targetSysRoot.ios_arm32 = target-sysroot-7-ios_arm64
libffiDir.ios_arm32 = libffi-3.2.1-2-darwin-ios libffiDir.ios_arm32 = libffi-3.2.1-2-darwin-ios
llvmLtoFlags.ios_arm32 = llvmLtoFlags.ios_arm32 =
llvmLtoOptFlags.ios_arm32 = -O3 -function-sections llvmLtoOptFlags.ios_arm32 = -O3 -function-sections
@@ -89,17 +89,17 @@ osVersionMinFlagClang.ios_arm32 = -miphoneos-version-min
osVersionMin.ios_arm32 = 9.0 osVersionMin.ios_arm32 = 9.0
# Apple's 64-bit iOS. # Apple's 64-bit iOS.
targetToolchain.macos_x64-ios_arm64 = target-toolchain-6-macos_x64 targetToolchain.macos_x64-ios_arm64 = target-toolchain-7-macos_x64
dependencies.macos_x64-ios_arm64 = \ dependencies.macos_x64-ios_arm64 = \
libffi-3.2.1-2-darwin-ios \ libffi-3.2.1-2-darwin-ios \
clang-llvm-6.0.1-darwin-macos clang-llvm-6.0.1-darwin-macos
target-sysroot-6-ios_arm64.default = \ target-sysroot-7-ios_arm64.default = \
remote:internal remote:internal
arch.ios_arm64 = arm64 arch.ios_arm64 = arm64
entrySelector.ios_arm64 = -alias _Konan_main _main entrySelector.ios_arm64 = -alias _Konan_main _main
targetSysRoot.ios_arm64 = target-sysroot-6-ios_arm64 targetSysRoot.ios_arm64 = target-sysroot-7-ios_arm64
libffiDir.ios_arm64 = libffi-3.2.1-2-darwin-ios libffiDir.ios_arm64 = libffi-3.2.1-2-darwin-ios
llvmLtoFlags.ios_arm64 = llvmLtoFlags.ios_arm64 =
llvmLtoOptFlags.ios_arm64 = -O3 -function-sections llvmLtoOptFlags.ios_arm64 = -O3 -function-sections
@@ -111,20 +111,20 @@ linkerKonanFlags.ios_arm64 = -lc++ -lobjc -framework Foundation -sdk_version 11.
linkerOptimizationFlags.ios_arm64 = -dead_strip linkerOptimizationFlags.ios_arm64 = -dead_strip
osVersionMinFlagLd.ios_arm64 = -iphoneos_version_min osVersionMinFlagLd.ios_arm64 = -iphoneos_version_min
osVersionMinFlagClang.ios_arm64 = -miphoneos-version-min osVersionMinFlagClang.ios_arm64 = -miphoneos-version-min
osVersionMin.ios_arm64 = 8.0 osVersionMin.ios_arm64 = 9.0
# Apple's iOS simulator. # Apple's iOS simulator.
targetToolchain.macos_x64-ios_x64 = target-toolchain-6-macos_x64 targetToolchain.macos_x64-ios_x64 = target-toolchain-7-macos_x64
dependencies.macos_x64-ios_x64 = \ dependencies.macos_x64-ios_x64 = \
libffi-3.2.1-1-darwin-ios_sim \ libffi-3.2.1-1-darwin-ios_sim \
clang-llvm-6.0.1-darwin-macos clang-llvm-6.0.1-darwin-macos
target-sysroot-6-ios_x64.default = \ target-sysroot-7-ios_x64.default = \
remote:internal remote:internal
arch.ios_x64 = x86_64 arch.ios_x64 = x86_64
entrySelector.ios_x64 = -alias _Konan_main _main entrySelector.ios_x64 = -alias _Konan_main _main
targetSysRoot.ios_x64 = target-sysroot-6-ios_x64 targetSysRoot.ios_x64 = target-sysroot-7-ios_x64
libffiDir.ios_x64 = libffi-3.2.1-1-darwin-ios_sim libffiDir.ios_x64 = libffi-3.2.1-1-darwin-ios_sim
llvmLtoFlags.ios_x64 = llvmLtoFlags.ios_x64 =
llvmLtoOptFlags.ios_x64 = -O3 -function-sections llvmLtoOptFlags.ios_x64 = -O3 -function-sections
@@ -136,7 +136,7 @@ linkerNoDebugFlags.ios_x64 = -S
linkerDynamicFlags.ios_x64 = -dylib linkerDynamicFlags.ios_x64 = -dylib
osVersionMinFlagLd.ios_x64 = -ios_simulator_version_min osVersionMinFlagLd.ios_x64 = -ios_simulator_version_min
osVersionMinFlagClang.ios_x64 = -mios-simulator-version-min osVersionMinFlagClang.ios_x64 = -mios-simulator-version-min
osVersionMin.ios_x64 = 8.0 osVersionMin.ios_x64 = 9.0
# Linux x86-64. # Linux x86-64.
llvmHome.linux_x64 = clang-llvm-6.0.1-linux-x86-64 llvmHome.linux_x64 = clang-llvm-6.0.1-linux-x86-64
shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt
+2 -2
View File
@@ -59,10 +59,10 @@ class ClangArgs(private val configurables: Configurables) : Configurables by con
listOf("-stdlib=libc++", "-arch", "armv7", "-isysroot", absoluteTargetSysRoot, "-miphoneos-version-min=9.0.0") listOf("-stdlib=libc++", "-arch", "armv7", "-isysroot", absoluteTargetSysRoot, "-miphoneos-version-min=9.0.0")
KonanTarget.IOS_ARM64 -> KonanTarget.IOS_ARM64 ->
listOf("-stdlib=libc++", "-arch", "arm64", "-isysroot", absoluteTargetSysRoot, "-miphoneos-version-min=8.0.0") listOf("-stdlib=libc++", "-arch", "arm64", "-isysroot", absoluteTargetSysRoot, "-miphoneos-version-min=9.0.0")
KonanTarget.IOS_X64 -> KonanTarget.IOS_X64 ->
listOf("-stdlib=libc++", "-isysroot", absoluteTargetSysRoot, "-miphoneos-version-min=8.0.0") listOf("-stdlib=libc++", "-isysroot", absoluteTargetSysRoot, "-miphoneos-version-min=9.0.0")
KonanTarget.ANDROID_ARM32 -> KonanTarget.ANDROID_ARM32 ->
listOf("-target", targetArg!!, listOf("-target", targetArg!!,
shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/KonanProperties.kt
+1 -1
View File
@@ -69,7 +69,7 @@ fun Properties.keepOnlyDefaultProfiles() {
// Force build to use only 'default' profile: // Force build to use only 'default' profile:
this.setProperty(DEPENDENCY_PROFILES_KEY, "default") this.setProperty(DEPENDENCY_PROFILES_KEY, "default")
// Force build to use fixed Xcode version: // Force build to use fixed Xcode version:
this.setProperty("useFixedXcodeVersion", "9.4.1") this.setProperty("useFixedXcodeVersion", "10.0")
// TODO: it actually affects only resolution made in :dependencies, // TODO: it actually affects only resolution made in :dependencies,
// that's why we assume that 'default' profile comes first (and check this above). // that's why we assume that 'default' profile comes first (and check this above).
} }
tools/scripts/update_xcode.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
KONAN_TOOLCHAIN_VERSION=6 KONAN_TOOLCHAIN_VERSION=7
SDKS="macosx iphoneos iphonesimulator watchos watchsimulator" SDKS="macosx iphoneos iphonesimulator watchos watchsimulator"
TARBALL_macosx=target-sysroot-$KONAN_TOOLCHAIN_VERSION-macos_x64 TARBALL_macosx=target-sysroot-$KONAN_TOOLCHAIN_VERSION-macos_x64
TARBALL_iphoneos=target-sysroot-$KONAN_TOOLCHAIN_VERSION-ios_arm64 TARBALL_iphoneos=target-sysroot-$KONAN_TOOLCHAIN_VERSION-ios_arm64