From d04b3050c005701bf6d237c52454c995622a60c9 Mon Sep 17 00:00:00 2001 From: Alexander Shabalin Date: Wed, 17 Jan 2024 14:01:48 +0100 Subject: [PATCH] [K/N] Remove old workaround for osVersionMin on arm macOS --- .../src/org/jetbrains/kotlin/konan/target/ClangArgs.kt | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/native/utils/src/org/jetbrains/kotlin/konan/target/ClangArgs.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/ClangArgs.kt index 70ca970bfb7..973233eb199 100644 --- a/native/utils/src/org/jetbrains/kotlin/konan/target/ClangArgs.kt +++ b/native/utils/src/org/jetbrains/kotlin/konan/target/ClangArgs.kt @@ -94,15 +94,8 @@ sealed class ClangArgs( val targetString: String = when { argsForWindowsJni -> "x86_64-pc-windows-msvc" configurables is AppleConfigurables -> { - val osVersionMin = when (target) { - // Here we workaround Clang 8 limitation: macOS major version should be 10. - // So we compile runtime with version 10.16 and then override version in BitcodeCompiler. - // TODO: Fix with LLVM Update. - KonanTarget.MACOS_ARM64 -> "10.16" - else -> configurables.osVersionMin - } targetTriple.copy( - os = "${targetTriple.os}$osVersionMin" + os = "${targetTriple.os}${configurables.osVersionMin}" ).toString() } else -> configurables.targetTriple.toString()