From 54b64eca08e024d6948791430ffade167bfb08c4 Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Mon, 26 Oct 2020 20:32:32 +0300 Subject: [PATCH] Fix KLibInstall: use project's property for dist path. --- .../src/main/kotlin/org/jetbrains/kotlin/KLibInstall.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KLibInstall.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KLibInstall.kt index 07bc51be939..faea66b2134 100644 --- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KLibInstall.kt +++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KLibInstall.kt @@ -14,6 +14,8 @@ import java.io.File open class KlibInstall: Exec() { @InputFile lateinit var klib: File + + @Input var repo: File = project.rootDir val installDir: File @@ -28,8 +30,7 @@ open class KlibInstall: Exec() { override fun configure(config: Closure<*>): Task { val result = super.configure(config) - val konanHomePath = project.findProperty("org.jetbrains.kotlin.native.home") ?: "dist" - val konanHome = project.rootProject.file(konanHomePath) + val konanHome = project.kotlinNativeDist val suffix = if (HostManager.host == KonanTarget.MINGW_X64) ".bat" else "" val klibProgram = "$konanHome/bin/klib$suffix"