From 14efa811e3ab4147fe469febfff6d8c0568a04ec Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Fri, 20 Apr 2018 17:09:47 +0300 Subject: [PATCH] Support static Android libs as well. --- .../main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt | 4 ++-- 1 file changed, 2 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 3e94b6295f9..e24b935eb4d 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 @@ -66,7 +66,7 @@ abstract class LinkerFlags(val configurables: Configurables) protected fun postLinkGnuArCommand(ar: String, executable: ExecutableFile) = Command("/bin/sh", "-c").apply { - +"/bin/echo -e 'create $executable\\naddlib $executable\\nsave\\nend' | $ar -M" + +"printf 'create $executable\\naddlib $executable\\nsave\\nend' | $ar -M" } } @@ -76,7 +76,7 @@ open class AndroidLinker(targetProperties: AndroidConfigurables) private val prefix = "$absoluteTargetToolchain/bin/" private val clang = "$prefix/clang" - private val ar = "$prefix/ar" + private val ar = "$absoluteTargetToolchain/${targetProperties.targetArg}/bin/ar" override val useCompilerDriverAsLinker: Boolean get() = true