diff --git a/konan/konan.properties b/konan/konan.properties index 503bacdd67c..931d592f879 100644 --- a/konan/konan.properties +++ b/konan/konan.properties @@ -35,10 +35,10 @@ llvmVersion = 6.0.1 # Mac OS X. 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 -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 llvmLtoFlags.macos_x64 = llvmLtoOptFlags.macos_x64 = -O3 -function-sections @@ -56,25 +56,25 @@ dependencies.macos_x64 = \ libffi-3.2.1-2-darwin-macos \ clang-llvm-6.0.1-darwin-macos -target-sysroot-6-macos_x64.default = \ +target-sysroot-7-macos_x64.default = \ remote:internal -target-toolchain-6-macos_x64.default = \ +target-toolchain-7-macos_x64.default = \ remote:internal # 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 = \ libffi-3.2.1-2-darwin-ios \ clang-llvm-6.0.1-darwin-macos -target-sysroot-6-ios_arm32.default = \ +target-sysroot-7-ios_arm32.default = \ remote:internal arch.ios_arm32 = armv7 entrySelector.ios_arm32 = -alias _Konan_main _main # 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 llvmLtoFlags.ios_arm32 = llvmLtoOptFlags.ios_arm32 = -O3 -function-sections @@ -89,17 +89,17 @@ osVersionMinFlagClang.ios_arm32 = -miphoneos-version-min osVersionMin.ios_arm32 = 9.0 # 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 = \ libffi-3.2.1-2-darwin-ios \ clang-llvm-6.0.1-darwin-macos -target-sysroot-6-ios_arm64.default = \ +target-sysroot-7-ios_arm64.default = \ remote:internal arch.ios_arm64 = arm64 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 llvmLtoFlags.ios_arm64 = 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 osVersionMinFlagLd.ios_arm64 = -iphoneos_version_min osVersionMinFlagClang.ios_arm64 = -miphoneos-version-min -osVersionMin.ios_arm64 = 8.0 +osVersionMin.ios_arm64 = 9.0 # 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 = \ libffi-3.2.1-1-darwin-ios_sim \ clang-llvm-6.0.1-darwin-macos -target-sysroot-6-ios_x64.default = \ +target-sysroot-7-ios_x64.default = \ remote:internal arch.ios_x64 = x86_64 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 llvmLtoFlags.ios_x64 = llvmLtoOptFlags.ios_x64 = -O3 -function-sections @@ -136,7 +136,7 @@ linkerNoDebugFlags.ios_x64 = -S linkerDynamicFlags.ios_x64 = -dylib osVersionMinFlagLd.ios_x64 = -ios_simulator_version_min osVersionMinFlagClang.ios_x64 = -mios-simulator-version-min -osVersionMin.ios_x64 = 8.0 +osVersionMin.ios_x64 = 9.0 # Linux x86-64. llvmHome.linux_x64 = clang-llvm-6.0.1-linux-x86-64 diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt index a75eb2a3a55..d1c1ac57927 100644 --- a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt +++ b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt @@ -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") 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 -> - 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 -> listOf("-target", targetArg!!, diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/KonanProperties.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/KonanProperties.kt index 3cb5cd6261a..9fe3cc4211d 100644 --- a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/KonanProperties.kt +++ b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/KonanProperties.kt @@ -69,7 +69,7 @@ fun Properties.keepOnlyDefaultProfiles() { // Force build to use only 'default' profile: this.setProperty(DEPENDENCY_PROFILES_KEY, "default") // 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, // that's why we assume that 'default' profile comes first (and check this above). } diff --git a/tools/scripts/update_xcode.sh b/tools/scripts/update_xcode.sh index 0304db7fdf1..f93c86fa7f1 100755 --- a/tools/scripts/update_xcode.sh +++ b/tools/scripts/update_xcode.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -KONAN_TOOLCHAIN_VERSION=6 +KONAN_TOOLCHAIN_VERSION=7 SDKS="macosx iphoneos iphonesimulator watchos watchsimulator" TARBALL_macosx=target-sysroot-$KONAN_TOOLCHAIN_VERSION-macos_x64 TARBALL_iphoneos=target-sysroot-$KONAN_TOOLCHAIN_VERSION-ios_arm64