From 609296a46b732a981bc761eb75d696f0ab5566de Mon Sep 17 00:00:00 2001 From: Elena Lepilkina Date: Fri, 16 Jul 2021 14:18:02 +0300 Subject: [PATCH] [K/N] Use libclang_rt version for simulator for last Xcode versions (KT-47333 fixed) --- .../main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt b/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt index b340d2cf40d..8d071a813fc 100644 --- a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt +++ b/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt @@ -184,7 +184,10 @@ class MacOSBasedLinker(targetProperties: AppleConfigurables) Family.OSX -> "osx" else -> error("Target $target is unsupported") } - val suffix = if (libraryName.isNotEmpty() && targetTriple.isSimulator) { + // TODO: remove after `minimalXcodeVersion` will be 12. + // Separate libclang_rt version for simulator appeared in Xcode 12. + val compilerRtForSimulatorExists = Xcode.current.version.substringBefore('.').toInt() >= 12 + val suffix = if ((libraryName.isNotEmpty() || compilerRtForSimulatorExists) && targetTriple.isSimulator) { "sim" } else { ""