commit 0651098494c04429d055c3a6b42eac28864a5919
author Svyatoslav Scherbina <svyatoslav.scherbina@jetbrains.com> Wed Aug 14 12:06:34 2024 +0200
committer Svyatoslav Scherbina <svyatoslav.scherbina@jetbrains.com> Thu Aug 15 16:59:23 2024 +0200
tree c3f03ed42e8f8a7dce855d1e8636bbdc338b53e8
parent c038ae3498d15b36bf508558b7f5253c85a616f8

[K/N] Update konan.properties to use Kotlin fork of Apple LLVM 11.1.0

This commit updates the LLVM dependency specified in konan.properties
on macOS from Apple LLVM 11.1.0 to Kotlin fork of it.
The fork adds only the fix for KT-70566 and patches necessary because of
the rebuild with modern toolchain (KT-61299).

^KT-70566 Fixed

kotlin-native/konan/konan.properties

diff --git a/kotlin-native/konan/konan.properties b/kotlin-native/konan/konan.properties
index b24dba8..76f1733 100644
--- a/kotlin-native/konan/konan.properties
+++ b/kotlin-native/konan/konan.properties
@@ -35,15 +35,20 @@
 reducedLlvmAppendix = compact
 
 predefinedLlvmDistributions = \
-  apple-llvm-20200714-macos-x64-1 \
-  apple-llvm-20200714-macos-aarch64-1 \
+  llvm-11.1.0-x86_64-macos-dev-47 \
+  llvm-11.1.0-aarch64-macos-dev-60 \
   llvm-11.1.0-linux-x64-2 \
   llvm-11.1.0-windows-x64-2 \
-  apple-llvm-20200714-macos-x64-essentials \
-  apple-llvm-20200714-macos-aarch64-essentials \
+  llvm-11.1.0-x86_64-macos-essentials-47 \
+  llvm-11.1.0-aarch64-macos-essentials-60 \
   llvm-11.1.0-linux-x64-essentials \
   llvm-11.1.0-windows-x64-essentials
 
+llvm-11.1.0-x86_64-macos-dev-47.default = remote:public:resources/llvm/11.1.0-x86_64-macos
+llvm-11.1.0-aarch64-macos-dev-60.default = remote:public:resources/llvm/11.1.0-aarch64-macos
+llvm-11.1.0-x86_64-macos-essentials-47.default = remote:public:resources/llvm/11.1.0-x86_64-macos
+llvm-11.1.0-aarch64-macos-essentials-60.default = remote:public:resources/llvm/11.1.0-aarch64-macos
+
 predefinedLibffiVersions = \
   libffi-3.2.1-3-darwin-macos \
   libffi-3.3-1-macos-arm64 \
@@ -56,11 +61,11 @@
 llvm.mingw_x64.dev = llvm-11.1.0-windows-x64-2
 llvm.mingw_x64.user = llvm-11.1.0-windows-x64-essentials
 
-llvm.macos_x64.dev = apple-llvm-20200714-macos-x64-1
-llvm.macos_x64.user = apple-llvm-20200714-macos-x64-essentials
+llvm.macos_x64.dev = llvm-11.1.0-x86_64-macos-dev-47
+llvm.macos_x64.user = llvm-11.1.0-x86_64-macos-essentials-47
 
-llvm.macos_arm64.dev = apple-llvm-20200714-macos-aarch64-1
-llvm.macos_arm64.user = apple-llvm-20200714-macos-aarch64-essentials
+llvm.macos_arm64.dev = llvm-11.1.0-aarch64-macos-dev-60
+llvm.macos_arm64.user = llvm-11.1.0-aarch64-macos-essentials-60
 
 # By default LLVM uses 250 for -03 builds.
 # We use a smaller value since default value leads to