azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support static Android libs as well.

Browse Source
This commit is contained in:
Nikolay Igotti
2018-04-20 17:09:47 +03:00
parent 515457fea0
commit 14efa811e3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt
+2 -2
View File
@@ -66,7 +66,7 @@ abstract class LinkerFlags(val configurables: Configurables)
protected fun postLinkGnuArCommand(ar: String, executable: ExecutableFile) = protected fun postLinkGnuArCommand(ar: String, executable: ExecutableFile) =
Command("/bin/sh", "-c").apply { 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 prefix = "$absoluteTargetToolchain/bin/"
private val clang = "$prefix/clang" private val clang = "$prefix/clang"
private val ar = "$prefix/ar" private val ar = "$absoluteTargetToolchain/${targetProperties.targetArg}/bin/ar"
override val useCompilerDriverAsLinker: Boolean get() = true override val useCompilerDriverAsLinker: Boolean get() = true