Fix K/N module compilation in MPP project imported from Gradle #KT-26688

This commit is contained in:
Dmitriy Dolovov
2018-09-10 10:57:01 +03:00
parent 4c7972a9e8
commit 5183eba70b
@@ -59,9 +59,6 @@ open class KotlinNativeCompile : DefaultTask() {
val kotlinNativeVersion: String
@Input get() = KonanCompilerDownloadTask.compilerVersion.toString()
val kotlinNativeHome: File
@Input get() = project.file(project.konanHome)
// We manually register this property as output file or directory depending on output kind.
@Internal
val outputFile: Property<File> = project.objects.property(File::class.java)
@@ -135,7 +132,7 @@ open class KotlinNativeCompile : DefaultTask() {
libraries.files.filter {
// Support only klib files for now.
it.extension == "klib" || !it.providedByCompiler
it.extension == "klib" && !it.providedByCompiler
}.forEach { library ->
library.parent?.let { addArg("-r", it) }
addArg("-l", library.nameWithoutExtension)