diff --git a/kotlin-native/konan/konan.properties b/kotlin-native/konan/konan.properties index 55b2960246c..9a6c80ac7c9 100644 --- a/kotlin-native/konan/konan.properties +++ b/kotlin-native/konan/konan.properties @@ -108,14 +108,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_14_1_rc +targetToolchain.macos_x64 = target-toolchain-xcode_14_1_rc2 libffiDir.macos_x64 = libffi-3.2.1-3-darwin-macos -additionalToolsDir.macos_x64 = xcode-addon-xcode_14_1_rc +additionalToolsDir.macos_x64 = xcode-addon-xcode_14_1_rc2 -targetToolchain.macos_arm64-macos_x64 = target-toolchain-xcode_14_1_rc +targetToolchain.macos_arm64-macos_x64 = target-toolchain-xcode_14_1_rc2 targetTriple.macos_x64 = x86_64-apple-macos -targetSysRoot.macos_x64 = target-sysroot-xcode_14_1_rc-macosx +targetSysRoot.macos_x64 = target-sysroot-xcode_14_1_rc2-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 @@ -135,24 +135,24 @@ osVersionMin.macos_x64 = 10.13 dependencies.macos_x64 = \ lldb-4-macos -target-sysroot-xcode_14_1_rc-macosx.default = \ +target-sysroot-xcode_14_1_rc2-macosx.default = \ remote:internal -target-toolchain-xcode_14_1_rc.default = \ +target-toolchain-xcode_14_1_rc2.default = \ remote:internal -xcode-addon-xcode_14_1_rc.default = \ +xcode-addon-xcode_14_1_rc2.default = \ remote:internal # macOS Apple Silicon llvmHome.macos_arm64 = $llvm.macos_arm64.dev -targetToolchain.macos_arm64 = target-toolchain-xcode_14_1_rc +targetToolchain.macos_arm64 = target-toolchain-xcode_14_1_rc2 libffiDir.macos_arm64 = libffi-3.3-1-macos-arm64 -additionalToolsDir.macos_arm64 = xcode-addon-xcode_14_1_rc +additionalToolsDir.macos_arm64 = xcode-addon-xcode_14_1_rc2 -targetToolchain.macos_x64-macos_arm64 = target-toolchain-xcode_14_1_rc +targetToolchain.macos_x64-macos_arm64 = target-toolchain-xcode_14_1_rc2 targetTriple.macos_arm64 = arm64-apple-macos -targetSysRoot.macos_arm64 = target-sysroot-xcode_14_1_rc-macosx +targetSysRoot.macos_arm64 = target-sysroot-xcode_14_1_rc2-macosx # TODO: Check Clang behaviour. targetCpu.macos_arm64 = apple-a7 clangFlags.macos_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir @@ -175,25 +175,25 @@ dependencies.macos_arm64 = \ lldb-4-macos -target-sysroot-xcode_14_1_rc-macos_arm64.default = \ +target-sysroot-xcode_14_1_rc2-macos_arm64.default = \ remote:internal -target-toolchain-xcode_14_1_rc-macos_arm64.default = \ +target-toolchain-xcode_14_1_rc2-macos_arm64.default = \ remote:internal -xcode-addon-xcode_14_1_rc-macos_arm64.default = \ +xcode-addon-xcode_14_1_rc2-macos_arm64.default = \ remote:internal # Apple's 32-bit iOS. -targetToolchain.macos_x64-ios_arm32 = target-toolchain-xcode_14_1_rc -targetToolchain.macos_arm64-ios_arm32 = target-toolchain-xcode_14_1_rc +targetToolchain.macos_x64-ios_arm32 = target-toolchain-xcode_14_1_rc2 +targetToolchain.macos_arm64-ios_arm32 = target-toolchain-xcode_14_1_rc2 -target-sysroot-xcode_14_1_rc-ios_arm32.default = \ +target-sysroot-xcode_14_1_rc2-ios_arm32.default = \ remote:internal targetTriple.ios_arm32 = armv7-apple-ios # Shared with 64-bit version. -targetSysRoot.ios_arm32 = target-sysroot-xcode_14_1_rc-iphoneos +targetSysRoot.ios_arm32 = target-sysroot-xcode_14_1_rc2-iphoneos targetCpu.ios_arm32 = generic clangFlags.ios_arm32 = -cc1 -emit-obj -disable-llvm-optzns -x ir clangNooptFlags.ios_arm32 = -O1 @@ -208,17 +208,17 @@ linkerOptimizationFlags.ios_arm32 = -dead_strip osVersionMinFlagLd.ios_arm32 = -iphoneos_version_min osVersionMin.ios_arm32 = 9.0 - + # Apple's 64-bit iOS. -targetToolchain.macos_x64-ios_arm64 = target-toolchain-xcode_14_1_rc -targetToolchain.macos_arm64-ios_arm64 = target-toolchain-xcode_14_1_rc +targetToolchain.macos_x64-ios_arm64 = target-toolchain-xcode_14_1_rc2 +targetToolchain.macos_arm64-ios_arm64 = target-toolchain-xcode_14_1_rc2 -target-sysroot-xcode_14_1_rc-iphoneos.default = \ +target-sysroot-xcode_14_1_rc2-iphoneos.default = \ remote:internal targetTriple.ios_arm64 = arm64-apple-ios -targetSysRoot.ios_arm64 = target-sysroot-xcode_14_1_rc-iphoneos +targetSysRoot.ios_arm64 = target-sysroot-xcode_14_1_rc2-iphoneos targetCpu.ios_arm64 = apple-a7 clangFlags.ios_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.ios_arm64 = -O1 @@ -239,14 +239,14 @@ osVersionMin.ios_arm64 = 9.0 additionalCacheFlags.ios_arm64 = -Xembed-bitcode-marker # Apple's iOS simulator. -targetToolchain.macos_x64-ios_x64 = target-toolchain-xcode_14_1_rc -targetToolchain.macos_arm64-ios_x64 = target-toolchain-xcode_14_1_rc +targetToolchain.macos_x64-ios_x64 = target-toolchain-xcode_14_1_rc2 +targetToolchain.macos_arm64-ios_x64 = target-toolchain-xcode_14_1_rc2 -target-sysroot-xcode_14_1_rc-iphonesimulator.default = \ +target-sysroot-xcode_14_1_rc2-iphonesimulator.default = \ remote:internal targetTriple.ios_x64 = x86_64-apple-ios-simulator -targetSysRoot.ios_x64 = target-sysroot-xcode_14_1_rc-iphonesimulator +targetSysRoot.ios_x64 = target-sysroot-xcode_14_1_rc2-iphonesimulator targetCpu.ios_x64 = core2 clangFlags.ios_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.ios_x64 = -O1 @@ -264,14 +264,14 @@ osVersionMin.ios_x64 = 9.0 # iOS simulator on Apple Silicon -targetToolchain.macos_x64-ios_simulator_arm64 = target-toolchain-xcode_14_1_rc -targetToolchain.macos_arm64-ios_simulator_arm64 = target-toolchain-xcode_14_1_rc +targetToolchain.macos_x64-ios_simulator_arm64 = target-toolchain-xcode_14_1_rc2 +targetToolchain.macos_arm64-ios_simulator_arm64 = target-toolchain-xcode_14_1_rc2 -target-sysroot-xcode_14_1_rc-ios_simulator_arm64.default = \ +target-sysroot-xcode_14_1_rc2-ios_simulator_arm64.default = \ remote:internal targetTriple.ios_simulator_arm64 = arm64-apple-ios-simulator -targetSysRoot.ios_simulator_arm64 = target-sysroot-xcode_14_1_rc-iphonesimulator +targetSysRoot.ios_simulator_arm64 = target-sysroot-xcode_14_1_rc2-iphonesimulator targetCpu.ios_simulator_arm64 = apple-a7 clangFlags.ios_simulator_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.ios_simulator_arm64 = -O1 @@ -288,14 +288,14 @@ osVersionMin.ios_simulator_arm64 = 9.0 # Apple's tvOS simulator. -targetToolchain.macos_x64-tvos_x64 = target-toolchain-xcode_14_1_rc -targetToolchain.macos_arm64-tvos_x64 = target-toolchain-xcode_14_1_rc +targetToolchain.macos_x64-tvos_x64 = target-toolchain-xcode_14_1_rc2 +targetToolchain.macos_arm64-tvos_x64 = target-toolchain-xcode_14_1_rc2 -target-sysroot-xcode_14_1_rc-appletvsimulator.default = \ +target-sysroot-xcode_14_1_rc2-appletvsimulator.default = \ remote:internal targetTriple.tvos_x64 = x86_64-apple-tvos-simulator -targetSysRoot.tvos_x64 = target-sysroot-xcode_14_1_rc-appletvsimulator +targetSysRoot.tvos_x64 = target-sysroot-xcode_14_1_rc2-appletvsimulator targetCpu.tvos_x64 = core2 clangFlags.tvos_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.tvos_x64 = -O1 @@ -312,14 +312,14 @@ osVersionMin.tvos_x64 = 9.0 # Apple's tvOS simulator. -targetToolchain.macos_x64-tvos_simulator_arm64 = target-toolchain-xcode_14_1_rc -targetToolchain.macos_arm64-tvos_simulator_arm64 = target-toolchain-xcode_14_1_rc +targetToolchain.macos_x64-tvos_simulator_arm64 = target-toolchain-xcode_14_1_rc2 +targetToolchain.macos_arm64-tvos_simulator_arm64 = target-toolchain-xcode_14_1_rc2 -target-sysroot-xcode_14_1_rc-tvos_simulator_arm64.default = \ +target-sysroot-xcode_14_1_rc2-tvos_simulator_arm64.default = \ remote:internal targetTriple.tvos_simulator_arm64 = arm64-apple-tvos-simulator -targetSysRoot.tvos_simulator_arm64 = target-sysroot-xcode_14_1_rc-appletvsimulator +targetSysRoot.tvos_simulator_arm64 = target-sysroot-xcode_14_1_rc2-appletvsimulator targetCpu.tvos_simulator_arm64 = apple-a7 clangFlags.tvos_simulator_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.tvos_simulator_arm64 = -O1 @@ -336,14 +336,14 @@ osVersionMin.tvos_simulator_arm64 = 9.0 # Apple's 64-bit tvOS. -targetToolchain.macos_x64-tvos_arm64 = target-toolchain-xcode_14_1_rc -targetToolchain.macos_arm64-tvos_arm64 = target-toolchain-xcode_14_1_rc +targetToolchain.macos_x64-tvos_arm64 = target-toolchain-xcode_14_1_rc2 +targetToolchain.macos_arm64-tvos_arm64 = target-toolchain-xcode_14_1_rc2 -target-sysroot-xcode_14_1_rc-appletvos.default = \ +target-sysroot-xcode_14_1_rc2-appletvos.default = \ remote:internal targetTriple.tvos_arm64 = arm64-apple-tvos -targetSysRoot.tvos_arm64 = target-sysroot-xcode_14_1_rc-appletvos +targetSysRoot.tvos_arm64 = target-sysroot-xcode_14_1_rc2-appletvos targetCpu.tvos_arm64 = apple-a7 clangFlags.tvos_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.tvos_arm64 = -O1 @@ -360,14 +360,14 @@ osVersionMin.tvos_arm64 = 9.0 # watchOS armv7k -targetToolchain.macos_x64-watchos_arm32 = target-toolchain-xcode_14_1_rc -targetToolchain.macos_arm64-watchos_arm32 = target-toolchain-xcode_14_1_rc +targetToolchain.macos_x64-watchos_arm32 = target-toolchain-xcode_14_1_rc2 +targetToolchain.macos_arm64-watchos_arm32 = target-toolchain-xcode_14_1_rc2 -target-sysroot-xcode_14_1_rc-watchos.default = \ +target-sysroot-xcode_14_1_rc2-watchos.default = \ remote:internal targetTriple.watchos_arm32 = armv7k-apple-watchos -targetSysRoot.watchos_arm32 = target-sysroot-xcode_14_1_rc-watchos +targetSysRoot.watchos_arm32 = target-sysroot-xcode_14_1_rc2-watchos targetCpu.watchos_arm32 = cortex-a7 clangFlags.watchos_arm32 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.watchos_arm32 = -O1 @@ -385,11 +385,11 @@ osVersionMin.watchos_arm32 = 5.0 # watchOS arm64_32 -targetToolchain.macos_x64-watchos_arm64 = target-toolchain-xcode_14_1_rc -targetToolchain.macos_arm64-watchos_arm64 = target-toolchain-xcode_14_1_rc +targetToolchain.macos_x64-watchos_arm64 = target-toolchain-xcode_14_1_rc2 +targetToolchain.macos_arm64-watchos_arm64 = target-toolchain-xcode_14_1_rc2 targetTriple.watchos_arm64 = arm64_32-apple-watchos -targetSysRoot.watchos_arm64 = target-sysroot-xcode_14_1_rc-watchos +targetSysRoot.watchos_arm64 = target-sysroot-xcode_14_1_rc2-watchos targetCpu.watchos_arm64 = apple-s4 clangFlags.watchos_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir -mllvm -aarch64-watch-bitcode-compatibility \ -mllvm -arm-bitcode-compatibility @@ -406,11 +406,11 @@ osVersionMinFlagLd.watchos_arm64 = -watchos_version_min osVersionMin.watchos_arm64 = 5.0 # watchOS arm64 -targetToolchain.macos_x64-watchos_device_arm64 = target-toolchain-xcode_14_1_rc -targetToolchain.macos_arm64-watchos_device_arm64 = target-toolchain-xcode_14_1_rc +targetToolchain.macos_x64-watchos_device_arm64 = target-toolchain-xcode_14_1_rc2 +targetToolchain.macos_arm64-watchos_device_arm64 = target-toolchain-xcode_14_1_rc2 targetTriple.watchos_device_arm64 = arm64-apple-watchos -targetSysRoot.watchos_device_arm64 = target-sysroot-xcode_14_1_rc-watchos +targetSysRoot.watchos_device_arm64 = target-sysroot-xcode_14_1_rc2-watchos targetCpu.watchos_device_arm64 = apple-a7 clangFlags.watchos_device_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.watchos_device_arm64 = -O1 @@ -427,14 +427,14 @@ osVersionMin.watchos_device_arm64 = 9.0 # Apple's watchOS i386 simulator. -targetToolchain.macos_x64-watchos_x86 = target-toolchain-xcode_14_1_rc -targetToolchain.macos_arm64-watchos_x86 = target-toolchain-xcode_14_1_rc +targetToolchain.macos_x64-watchos_x86 = target-toolchain-xcode_14_1_rc2 +targetToolchain.macos_arm64-watchos_x86 = target-toolchain-xcode_14_1_rc2 -target-sysroot-xcode_14_1_rc-watchsimulator.default = \ +target-sysroot-xcode_14_1_rc2-watchsimulator.default = \ remote:internal targetTriple.watchos_x86 = i386-apple-watchos-simulator -targetSysRoot.watchos_x86 = target-sysroot-xcode_14_1_rc-watchsimulator +targetSysRoot.watchos_x86 = target-sysroot-xcode_14_1_rc2-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 @@ -452,14 +452,14 @@ osVersionMin.watchos_x86 = 5.0 # watchOS x86_64 simulator. -targetToolchain.macos_x64-watchos_x64 = target-toolchain-xcode_14_1_rc -targetToolchain.macos_arm64-watchos_x64 = target-toolchain-xcode_14_1_rc +targetToolchain.macos_x64-watchos_x64 = target-toolchain-xcode_14_1_rc2 +targetToolchain.macos_arm64-watchos_x64 = target-toolchain-xcode_14_1_rc2 -target-sysroot-xcode_14_1_rc-watchos_x64.default = \ +target-sysroot-xcode_14_1_rc2-watchos_x64.default = \ remote:internal targetTriple.watchos_x64 = x86_64-apple-watchos-simulator -targetSysRoot.watchos_x64 = target-sysroot-xcode_14_1_rc-watchsimulator +targetSysRoot.watchos_x64 = target-sysroot-xcode_14_1_rc2-watchsimulator targetCpu.watchos_x64 = core2 clangFlags.watchos_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.watchos_x64 = -O1 @@ -476,14 +476,14 @@ osVersionMin.watchos_x64 = 7.0 # watchOS Apple Silicon simulator. -targetToolchain.macos_x64-watchos_simulator_arm64 = target-toolchain-xcode_14_1_rc -targetToolchain.macos_arm64-watchos_simulator_arm64 = target-toolchain-xcode_14_1_rc +targetToolchain.macos_x64-watchos_simulator_arm64 = target-toolchain-xcode_14_1_rc2 +targetToolchain.macos_arm64-watchos_simulator_arm64 = target-toolchain-xcode_14_1_rc2 -target-sysroot-xcode_14_1_rc-watchos_simulator_arm64.default = \ +target-sysroot-xcode_14_1_rc2-watchos_simulator_arm64.default = \ remote:internal targetTriple.watchos_simulator_arm64 = arm64-apple-watchos-simulator -targetSysRoot.watchos_simulator_arm64 = target-sysroot-xcode_14_1_rc-watchsimulator +targetSysRoot.watchos_simulator_arm64 = target-sysroot-xcode_14_1_rc2-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 3571c4a9df0..af456ddef6f 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_14_1_rc +KONAN_TOOLCHAIN_VERSION=xcode_14_1_rc2 SDKS="macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator" TARBALL_macosx=target-sysroot-$KONAN_TOOLCHAIN_VERSION-macosx TARBALL_iphoneos=target-sysroot-$KONAN_TOOLCHAIN_VERSION-iphoneos