From 48ef739525365ad66ae1a12c44a060251a6ff4bf Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Fri, 21 May 2021 13:06:23 +0300 Subject: [PATCH] [native] Rename Apple MacOS targets in simpleOsName Use Arm64 suffix for Apple Arm arch and X64 for Intel X86_64 --- .../src/org/jetbrains/kotlin/konan/target/HostManager.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt index fbaa207a277..ef1412dd5b5 100644 --- a/native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt +++ b/native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt @@ -169,7 +169,14 @@ open class HostManager( @JvmStatic fun simpleOsName(): String { val hostOs = hostOs() - return if (hostOs == "osx") "macos" else hostOs + val arch = hostArch() + return when (hostOs) { + "osx" -> { + if (arch == "aarch64") "macosArm64" + else "macosX64" + } + else -> hostOs + } } val jniHostPlatformIncludeDir: String