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

Android linker fix (#3358)

Browse Source
This commit is contained in:
Mike Sinkovsky
2019-09-18 19:28:46 +05:00
committed by Nikolay Igotti
parent f0acaf82b5
commit 392381c9ff
1 changed files with 6 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
+6 -2
View File
@@ -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