From 391458c355d1d50e7fb1a2e0bb1e02103255d285 Mon Sep 17 00:00:00 2001 From: Alexander Shabalin Date: Fri, 12 Mar 2021 12:26:31 +0300 Subject: [PATCH] Fix CompileToBitcode's llvm-link invocation Porting https://github.com/jetbrains/kotlin-native/pull/4536 which got lost in https://jetbrains.team/p/kt/code/kotlin/revision/c85c3ac1235bea8a469694f887febc6ee4979181 --- .../kotlin/org/jetbrains/kotlin/bitcode/CompileToBitcode.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/bitcode/CompileToBitcode.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/bitcode/CompileToBitcode.kt index 812b8f96712..4867b4e1d9e 100644 --- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/bitcode/CompileToBitcode.kt +++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/bitcode/CompileToBitcode.kt @@ -167,9 +167,9 @@ open class CompileToBitcode @Inject constructor( val llvmDir = project.findProperty("llvmDir") executable = "$llvmDir/bin/llvm-link" args = listOf("-o", outFile.absolutePath) + linkerArgs + - project.fileTree(objDir) { - include("**/*.bc") - }.files.map { it.absolutePath } + inputFiles.map { + bitcodeFileForInputFile(it).absolutePath + } } } }