From 9b06df48e4f7e35be0d9a9d9c661839b35d7fba6 Mon Sep 17 00:00:00 2001 From: Sergey Bogolepov Date: Tue, 23 Nov 2021 12:43:54 +0300 Subject: [PATCH] [K/N] Update Xcode version to 13.1 --- kotlin-native/README.md | 2 +- kotlin-native/gradle.properties | 2 +- kotlin-native/konan/konan.properties | 122 ++++++++++---------- kotlin-native/tools/scripts/update_xcode.sh | 2 +- 4 files changed, 64 insertions(+), 64 deletions(-) diff --git a/kotlin-native/README.md b/kotlin-native/README.md index e57afac4edc..e135d1e8820 100644 --- a/kotlin-native/README.md +++ b/kotlin-native/README.md @@ -35,7 +35,7 @@ Prerequisites: * configure Kotlin build as [specified in main readme](../ReadMe.md#build-environment-requirements) * at the root directory of the repository, create `local.properties` file with `kotlin.native.enabled=true` line -* macOS: Xcode 12.5 or newer +* macOS: Xcode 13.1 or newer * Linux: glibc 2.23 or newer * Windows: * Microsoft C++ build tools for Visual Studio 2019 14.29 or newer diff --git a/kotlin-native/gradle.properties b/kotlin-native/gradle.properties index fa1b4e92dcb..dc3b4628571 100644 --- a/kotlin-native/gradle.properties +++ b/kotlin-native/gradle.properties @@ -19,7 +19,7 @@ remoteRoot=konan_tests konanVersion=1.6.0 # A version of Xcode required to build the Kotlin/Native compiler. -xcodeMajorVersion=12 +xcodeMajorVersion=13 # A GTest revision used to test the runtime. # The latest release GTest (1.10.0) doesn't properly register skipped tests in an XML-report. diff --git a/kotlin-native/konan/konan.properties b/kotlin-native/konan/konan.properties index e08842c3ee5..ae1fbdf38b6 100644 --- a/kotlin-native/konan/konan.properties +++ b/kotlin-native/konan/konan.properties @@ -100,14 +100,14 @@ optInCacheableTargets = # Mac OS X. # Can be an absolute path instead of predefined value. llvmHome.macos_x64 = $llvm.macos_x64.dev -targetToolchain.macos_x64 = target-toolchain-xcode_12_5 +targetToolchain.macos_x64 = target-toolchain-xcode_13_1 libffiDir.macos_x64 = libffi-3.2.1-3-darwin-macos -additionalToolsDir.macos_x64 = xcode-addon-xcode_12_5 +additionalToolsDir.macos_x64 = xcode-addon-xcode_13_1 -targetToolchain.macos_arm64-macos_x64 = target-toolchain-xcode_12_5 +targetToolchain.macos_arm64-macos_x64 = target-toolchain-xcode_13_1 targetTriple.macos_x64 = x86_64-apple-macos -targetSysRoot.macos_x64 = target-sysroot-xcode_12_5-macosx +targetSysRoot.macos_x64 = target-sysroot-xcode_13_1-macosx targetCpu.macos_x64 = core2 targetCpuFeatures.macos_x64=+cx16,+cx8,+fxsr,+mmx,+sahf,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87 clangFlags.macos_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir @@ -127,24 +127,24 @@ runtimeDefinitions.macos_x64 = KONAN_OSX=1 KONAN_MACOSX=1 KONAN_X64=1 KONAN_OBJC dependencies.macos_x64 = \ lldb-4-macos -target-sysroot-xcode_12_5-macosx.default = \ +target-sysroot-xcode_13_1-macosx.default = \ remote:internal -target-toolchain-xcode_12_5.default = \ +target-toolchain-xcode_13_1.default = \ remote:internal -xcode-addon-xcode_12_5.default = \ +xcode-addon-xcode_13_1.default = \ remote:internal # macOS Apple Silicon llvmHome.macos_arm64 = $llvm.macos_arm64.dev -targetToolchain.macos_arm64 = target-toolchain-xcode_12_5 +targetToolchain.macos_arm64 = target-toolchain-xcode_13_1 libffiDir.macos_arm64 = libffi-3.3-1-macos-arm64 -additionalToolsDir.macos_arm64 = xcode-addon-xcode_12_5 +additionalToolsDir.macos_arm64 = xcode-addon-xcode_13_1 -targetToolchain.macos_x64-macos_arm64 = target-toolchain-xcode_12_5 +targetToolchain.macos_x64-macos_arm64 = target-toolchain-xcode_13_1 targetTriple.macos_arm64 = arm64-apple-macos -targetSysRoot.macos_arm64 = target-sysroot-xcode_12_5-macosx +targetSysRoot.macos_arm64 = target-sysroot-xcode_13_1-macosx # TODO: Check Clang behaviour. targetCpu.macos_arm64 = apple-a7 clangFlags.macos_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir @@ -167,25 +167,25 @@ dependencies.macos_arm64 = \ lldb-4-macos -target-sysroot-xcode_12_5-macos_arm64.default = \ +target-sysroot-xcode_13_1-macos_arm64.default = \ remote:internal -target-toolchain-xcode_12_5-macos_arm64.default = \ +target-toolchain-xcode_13_1-macos_arm64.default = \ remote:internal -xcode-addon-xcode_12_5-macos_arm64.default = \ +xcode-addon-xcode_13_1-macos_arm64.default = \ remote:internal # Apple's 32-bit iOS. -targetToolchain.macos_x64-ios_arm32 = target-toolchain-xcode_12_5 -targetToolchain.macos_arm64-ios_arm32 = target-toolchain-xcode_12_5 +targetToolchain.macos_x64-ios_arm32 = target-toolchain-xcode_13_1 +targetToolchain.macos_arm64-ios_arm32 = target-toolchain-xcode_13_1 -target-sysroot-xcode_12_5-ios_arm32.default = \ +target-sysroot-xcode_13_1-ios_arm32.default = \ remote:internal targetTriple.ios_arm32 = armv7-apple-ios # Shared with 64-bit version. -targetSysRoot.ios_arm32 = target-sysroot-xcode_12_5-iphoneos +targetSysRoot.ios_arm32 = target-sysroot-xcode_13_1-iphoneos targetCpu.ios_arm32 = generic clangFlags.ios_arm32 = -cc1 -emit-obj -disable-llvm-optzns -x ir clangNooptFlags.ios_arm32 = -O1 @@ -208,14 +208,14 @@ runtimeDefinitions.ios_arm32 = KONAN_OBJC_INTEROP=1 KONAN_IOS KONAN_ARM32=1 \ KONAN_NO_64BIT_ATOMIC=1 KONAN_NO_UNALIGNED_ACCESS=1 # Apple's 64-bit iOS. -targetToolchain.macos_x64-ios_arm64 = target-toolchain-xcode_12_5 -targetToolchain.macos_arm64-ios_arm64 = target-toolchain-xcode_12_5 +targetToolchain.macos_x64-ios_arm64 = target-toolchain-xcode_13_1 +targetToolchain.macos_arm64-ios_arm64 = target-toolchain-xcode_13_1 -target-sysroot-xcode_12_5-iphoneos.default = \ +target-sysroot-xcode_13_1-iphoneos.default = \ remote:internal targetTriple.ios_arm64 = arm64-apple-ios -targetSysRoot.ios_arm64 = target-sysroot-xcode_12_5-iphoneos +targetSysRoot.ios_arm64 = target-sysroot-xcode_13_1-iphoneos targetCpu.ios_arm64 = apple-a7 clangFlags.ios_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.ios_arm64 = -O1 @@ -237,14 +237,14 @@ runtimeDefinitions.ios_arm64 = KONAN_OBJC_INTEROP=1 KONAN_IOS=1 KONAN_ARM64=1 \ additionalCacheFlags.ios_arm64 = -Xembed-bitcode-marker # Apple's iOS simulator. -targetToolchain.macos_x64-ios_x64 = target-toolchain-xcode_12_5 -targetToolchain.macos_arm64-ios_x64 = target-toolchain-xcode_12_5 +targetToolchain.macos_x64-ios_x64 = target-toolchain-xcode_13_1 +targetToolchain.macos_arm64-ios_x64 = target-toolchain-xcode_13_1 -target-sysroot-xcode_12_5-iphonesimulator.default = \ +target-sysroot-xcode_13_1-iphonesimulator.default = \ remote:internal targetTriple.ios_x64 = x86_64-apple-ios-simulator -targetSysRoot.ios_x64 = target-sysroot-xcode_12_5-iphonesimulator +targetSysRoot.ios_x64 = target-sysroot-xcode_13_1-iphonesimulator targetCpu.ios_x64 = core2 clangFlags.ios_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.ios_x64 = -O1 @@ -262,14 +262,14 @@ runtimeDefinitions.ios_x64 = KONAN_OBJC_INTEROP=1 KONAN_IOS=1 KONAN_X64=1 # iOS simulator on Apple Silicon -targetToolchain.macos_x64-ios_simulator_arm64 = target-toolchain-xcode_12_5 -targetToolchain.macos_arm64-ios_simulator_arm64 = target-toolchain-xcode_12_5 +targetToolchain.macos_x64-ios_simulator_arm64 = target-toolchain-xcode_13_1 +targetToolchain.macos_arm64-ios_simulator_arm64 = target-toolchain-xcode_13_1 -target-sysroot-xcode_12_5-ios_simulator_arm64.default = \ +target-sysroot-xcode_13_1-ios_simulator_arm64.default = \ remote:internal targetTriple.ios_simulator_arm64 = arm64-apple-ios-simulator -targetSysRoot.ios_simulator_arm64 = target-sysroot-xcode_12_5-iphonesimulator +targetSysRoot.ios_simulator_arm64 = target-sysroot-xcode_13_1-iphonesimulator targetCpu.ios_simulator_arm64 = apple-a7 clangFlags.ios_simulator_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.ios_simulator_arm64 = -O1 @@ -286,14 +286,14 @@ osVersionMin.ios_simulator_arm64 = 9.0 runtimeDefinitions.ios_simulator_arm64 = KONAN_OBJC_INTEROP=1 KONAN_IOS=1 KONAN_ARM64=1 # Apple's tvOS simulator. -targetToolchain.macos_x64-tvos_x64 = target-toolchain-xcode_12_5 -targetToolchain.macos_arm64-tvos_x64 = target-toolchain-xcode_12_5 +targetToolchain.macos_x64-tvos_x64 = target-toolchain-xcode_13_1 +targetToolchain.macos_arm64-tvos_x64 = target-toolchain-xcode_13_1 -target-sysroot-xcode_12_5-appletvsimulator.default = \ +target-sysroot-xcode_13_1-appletvsimulator.default = \ remote:internal targetTriple.tvos_x64 = x86_64-apple-tvos-simulator -targetSysRoot.tvos_x64 = target-sysroot-xcode_12_5-appletvsimulator +targetSysRoot.tvos_x64 = target-sysroot-xcode_13_1-appletvsimulator targetCpu.tvos_x64 = core2 clangFlags.tvos_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.tvos_x64 = -O1 @@ -310,14 +310,14 @@ osVersionMin.tvos_x64 = 9.0 runtimeDefinitions.tvos_x64 = KONAN_OBJC_INTEROP=1 KONAN_TVOS=1 KONAN_X64=1 # Apple's tvOS simulator. -targetToolchain.macos_x64-tvos_simulator_arm64 = target-toolchain-xcode_12_5 -targetToolchain.macos_arm64-tvos_simulator_arm64 = target-toolchain-xcode_12_5 +targetToolchain.macos_x64-tvos_simulator_arm64 = target-toolchain-xcode_13_1 +targetToolchain.macos_arm64-tvos_simulator_arm64 = target-toolchain-xcode_13_1 -target-sysroot-xcode_12_5-tvos_simulator_arm64.default = \ +target-sysroot-xcode_13_1-tvos_simulator_arm64.default = \ remote:internal targetTriple.tvos_simulator_arm64 = arm64-apple-tvos-simulator -targetSysRoot.tvos_simulator_arm64 = target-sysroot-xcode_12_5-appletvsimulator +targetSysRoot.tvos_simulator_arm64 = target-sysroot-xcode_13_1-appletvsimulator targetCpu.tvos_simulator_arm64 = apple-a7 clangFlags.tvos_simulator_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.tvos_simulator_arm64 = -O1 @@ -334,14 +334,14 @@ osVersionMin.tvos_simulator_arm64 = 9.0 runtimeDefinitions.tvos_simulator_arm64 = KONAN_OBJC_INTEROP=1 KONAN_TVOS=1 KONAN_ARM64=1 # Apple's 64-bit tvOS. -targetToolchain.macos_x64-tvos_arm64 = target-toolchain-xcode_12_5 -targetToolchain.macos_arm64-tvos_arm64 = target-toolchain-xcode_12_5 +targetToolchain.macos_x64-tvos_arm64 = target-toolchain-xcode_13_1 +targetToolchain.macos_arm64-tvos_arm64 = target-toolchain-xcode_13_1 -target-sysroot-xcode_12_5-appletvos.default = \ +target-sysroot-xcode_13_1-appletvos.default = \ remote:internal targetTriple.tvos_arm64 = arm64-apple-tvos -targetSysRoot.tvos_arm64 = target-sysroot-xcode_12_5-appletvos +targetSysRoot.tvos_arm64 = target-sysroot-xcode_13_1-appletvos targetCpu.tvos_arm64 = apple-a7 clangFlags.tvos_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.tvos_arm64 = -O1 @@ -359,14 +359,14 @@ runtimeDefinitions.tvos_arm64 = KONAN_OBJC_INTEROP=1 KONAN_TVOS=1 KONAN_ARM64=1 KONAN_REPORT_BACKTRACE_TO_IOS_CRASH_LOG=1 MACHSIZE=64 # watchOS armv7k -targetToolchain.macos_x64-watchos_arm32 = target-toolchain-xcode_12_5 -targetToolchain.macos_arm64-watchos_arm32 = target-toolchain-xcode_12_5 +targetToolchain.macos_x64-watchos_arm32 = target-toolchain-xcode_13_1 +targetToolchain.macos_arm64-watchos_arm32 = target-toolchain-xcode_13_1 -target-sysroot-xcode_12_5-watchos.default = \ +target-sysroot-xcode_13_1-watchos.default = \ remote:internal targetTriple.watchos_arm32 = armv7k-apple-watchos -targetSysRoot.watchos_arm32 = target-sysroot-xcode_12_5-watchos +targetSysRoot.watchos_arm32 = target-sysroot-xcode_13_1-watchos targetCpu.watchos_arm32 = cortex-a7 clangFlags.watchos_arm32 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.watchos_arm32 = -O1 @@ -386,11 +386,11 @@ runtimeDefinitions.watchos_arm32 = KONAN_OBJC_INTEROP=1 KONAN_WATCHOS KONAN_ARM3 MACHSIZE=32 KONAN_NO_64BIT_ATOMIC=1 KONAN_NO_UNALIGNED_ACCESS=1 # watchOS arm64_32 -targetToolchain.macos_x64-watchos_arm64 = target-toolchain-xcode_12_5 -targetToolchain.macos_arm64-watchos_arm64 = target-toolchain-xcode_12_5 +targetToolchain.macos_x64-watchos_arm64 = target-toolchain-xcode_13_1 +targetToolchain.macos_arm64-watchos_arm64 = target-toolchain-xcode_13_1 targetTriple.watchos_arm64 = arm64_32-apple-watchos -targetSysRoot.watchos_arm64 = target-sysroot-xcode_12_5-watchos +targetSysRoot.watchos_arm64 = target-sysroot-xcode_13_1-watchos # TODO: Use -target-cpu=apple-s4 when we start generating bitcode for arm64_32. targetCpu.watchos_arm64 = cortex-a7 clangFlags.watchos_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir -mllvm -aarch64-watch-bitcode-compatibility \ @@ -412,14 +412,14 @@ runtimeDefinitions.watchos_arm64 = KONAN_OBJC_INTEROP=1 KONAN_WATCHOS KONAN_ARM3 MACHSIZE=32 KONAN_NO_64BIT_ATOMIC=1 KONAN_NO_UNALIGNED_ACCESS=1 # Apple's watchOS i386 simulator. -targetToolchain.macos_x64-watchos_x86 = target-toolchain-xcode_12_5 -targetToolchain.macos_arm64-watchos_x86 = target-toolchain-xcode_12_5 +targetToolchain.macos_x64-watchos_x86 = target-toolchain-xcode_13_1 +targetToolchain.macos_arm64-watchos_x86 = target-toolchain-xcode_13_1 -target-sysroot-xcode_12_5-watchsimulator.default = \ +target-sysroot-xcode_13_1-watchsimulator.default = \ remote:internal targetTriple.watchos_x86 = i386-apple-watchos-simulator -targetSysRoot.watchos_x86 = target-sysroot-xcode_12_5-watchsimulator +targetSysRoot.watchos_x86 = target-sysroot-xcode_13_1-watchsimulator # Make sure that SSE2 is available by setting target-cpu to pentium4 targetCpu.watchos_x86 = pentium4 clangFlags.watchos_x86 = -cc1 -emit-obj -disable-llvm-passes -x ir @@ -437,14 +437,14 @@ osVersionMin.watchos_x86 = 5.0 runtimeDefinitions.watchos_x86 = KONAN_OBJC_INTEROP=1 KONAN_WATCHOS=1 KONAN_NO_64BIT_ATOMIC=1 KONAN_X86=1 # watchOS x86_64 simulator. -targetToolchain.macos_x64-watchos_x64 = target-toolchain-xcode_12_5 -targetToolchain.macos_arm64-watchos_x64 = target-toolchain-xcode_12_5 +targetToolchain.macos_x64-watchos_x64 = target-toolchain-xcode_13_1 +targetToolchain.macos_arm64-watchos_x64 = target-toolchain-xcode_13_1 -target-sysroot-xcode_12_5-watchos_x64.default = \ +target-sysroot-xcode_13_1-watchos_x64.default = \ remote:internal targetTriple.watchos_x64 = x86_64-apple-watchos-simulator -targetSysRoot.watchos_x64 = target-sysroot-xcode_12_5-watchsimulator +targetSysRoot.watchos_x64 = target-sysroot-xcode_13_1-watchsimulator targetCpu.watchos_x64 = core2 clangFlags.watchos_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.watchos_x64 = -O1 @@ -461,14 +461,14 @@ osVersionMin.watchos_x64 = 7.0 runtimeDefinitions.watchos_x64 = KONAN_OBJC_INTEROP=1 KONAN_WATCHOS=1 KONAN_X64=1 # watchOS Apple Silicon simulator. -targetToolchain.macos_x64-watchos_simulator_arm64 = target-toolchain-xcode_12_5 -targetToolchain.macos_arm64-watchos_simulator_arm64 = target-toolchain-xcode_12_5 +targetToolchain.macos_x64-watchos_simulator_arm64 = target-toolchain-xcode_13_1 +targetToolchain.macos_arm64-watchos_simulator_arm64 = target-toolchain-xcode_13_1 -target-sysroot-xcode_12_5-watchos_simulator_arm64.default = \ +target-sysroot-xcode_13_1-watchos_simulator_arm64.default = \ remote:internal targetTriple.watchos_simulator_arm64 = arm64-apple-watchos-simulator -targetSysRoot.watchos_simulator_arm64 = target-sysroot-xcode_12_5-watchsimulator +targetSysRoot.watchos_simulator_arm64 = target-sysroot-xcode_13_1-watchsimulator targetCpu.watchos_simulator_arm64 = apple-a7 clangFlags.watchos_simulator_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.watchos_simulator_arm64 = -O1 diff --git a/kotlin-native/tools/scripts/update_xcode.sh b/kotlin-native/tools/scripts/update_xcode.sh index c1cc248dc2f..b9154b65394 100755 --- a/kotlin-native/tools/scripts/update_xcode.sh +++ b/kotlin-native/tools/scripts/update_xcode.sh @@ -2,7 +2,7 @@ set -e # "brew install coreutils" for grealpath. -KONAN_TOOLCHAIN_VERSION=xcode_12_5 +KONAN_TOOLCHAIN_VERSION=xcode_13_1 SDKS="macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator" TARBALL_macosx=target-sysroot-$KONAN_TOOLCHAIN_VERSION-macosx TARBALL_iphoneos=target-sysroot-$KONAN_TOOLCHAIN_VERSION-iphoneos