From 4c45f71edb92ff2ead43912048b89442c9268ac8 Mon Sep 17 00:00:00 2001 From: Sergey Bogolepov Date: Wed, 24 Nov 2021 12:41:27 +0300 Subject: [PATCH] [K/N] Fix KT-49876 Use llvm-ar on Windows host when producing Linux static library. --- .../kotlin/org/jetbrains/kotlin/konan/target/Linker.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 65ad34c2e23..48fca7b9827 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 @@ -337,8 +337,11 @@ class MacOSBasedLinker(targetProperties: AppleConfigurables) class GccBasedLinker(targetProperties: GccConfigurables) : LinkerFlags(targetProperties), GccConfigurables by targetProperties { - private val ar = if (HostManager.hostIsMac) "$absoluteTargetToolchain/bin/llvm-ar" - else "$absoluteTargetToolchain/bin/ar" + private val ar = if (HostManager.hostIsLinux) { + "$absoluteTargetToolchain/bin/ar" + } else { + "$absoluteTargetToolchain/bin/llvm-ar" + } override val libGcc = "$absoluteTargetSysRoot/${super.libGcc}" private val specificLibs = abiSpecificLibraries.map { "-L${absoluteTargetSysRoot}/$it" }