From 392381c9ff22452b8273ed8a61c1d77eb2f42a37 Mon Sep 17 00:00:00 2001 From: Mike Sinkovsky Date: Wed, 18 Sep 2019 19:28:46 +0500 Subject: [PATCH] Android linker fix (#3358) --- .../kotlin/org/jetbrains/kotlin/konan/target/Linker.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt index 8dfeb735cc2..94761756a2b 100644 --- a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt +++ b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt @@ -92,8 +92,12 @@ abstract class LinkerFlags(val configurables: Configurables) open class AndroidLinker(targetProperties: AndroidConfigurables) : LinkerFlags(targetProperties), AndroidConfigurables by targetProperties { - private val prefix = "$absoluteTargetToolchain/bin/" - private val clang = if (HostManager.hostIsMingw) "$prefix/clang.cmd" else "$prefix/clang" + private val clangQuad = when (targetProperties.targetArg) { + "arm-linux-androideabi" -> "armv7a-linux-androideabi" + else -> targetProperties.targetArg + } + private val prefix = "$absoluteTargetToolchain/bin/${clangQuad}${Android.API}" + private val clang = if (HostManager.hostIsMingw) "$prefix-clang.cmd" else "$prefix-clang" private val ar = "$absoluteTargetToolchain/${targetProperties.targetArg}/bin/ar" override val useCompilerDriverAsLinker: Boolean get() = true