Filter bitcode files by extension when passing them to llvm (#2356)

This commit is contained in:
Sergey Bogolepov
2018-11-22 11:37:59 +07:00
committed by GitHub
parent d6091c93a1
commit c29be9c5ee
2 changed files with 5 additions and 1 deletions
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.backend.konan
import org.jetbrains.kotlin.konan.KonanExternalToolFailure
import org.jetbrains.kotlin.konan.exec.Command
import org.jetbrains.kotlin.konan.file.File
import org.jetbrains.kotlin.konan.file.isBitcode
import org.jetbrains.kotlin.konan.target.*
typealias BitcodeFile = String
@@ -199,7 +200,7 @@ internal class LinkStage(val context: Context, val phaser: PhaseManager) {
fun linkStage() {
val bitcodeFiles = listOf(emitted) +
libraries.map { it.bitcodePaths }.flatten()
libraries.map { it.bitcodePaths }.flatten().filter { it.isBitcode }
val includedBinaries =
libraries.map { it.includedPaths }.flatten()
@@ -24,3 +24,6 @@ val String.isUnixStaticLib
val String.isWindowsStaticLib
get() = this.endsWith(".lib")
val String.isBitcode
get() = this.endsWith(".bc")