From 5183eba70bcf29ecfca70bbda44ca3bb8bd15846 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Mon, 10 Sep 2018 10:57:01 +0300 Subject: [PATCH] Fix K/N module compilation in MPP project imported from Gradle #KT-26688 --- .../org/jetbrains/kotlin/gradle/tasks/KotlinNativeTasks.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinNativeTasks.kt index 58e3513b786..45f186c1c2e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinNativeTasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinNativeTasks.kt @@ -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 = 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)