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 45f186c1c2e..58e3513b786 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,6 +59,9 @@ 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)
@@ -132,7 +135,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)