azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix KLibInstall: use project's property for dist path.

Browse Source
This commit is contained in:
Pavel Punegov
2020-10-26 20:32:32 +03:00
committed by Stanislav Erokhin
parent cbdd6fd245
commit 54b64eca08
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KLibInstall.kt
+3 -2
View File
@@ -14,6 +14,8 @@ import java.io.File
open class KlibInstall: Exec() { open class KlibInstall: Exec() {
@InputFile @InputFile
lateinit var klib: File lateinit var klib: File
@Input
var repo: File = project.rootDir var repo: File = project.rootDir
val installDir: File val installDir: File
@@ -28,8 +30,7 @@ open class KlibInstall: Exec() {
override fun configure(config: Closure<*>): Task { override fun configure(config: Closure<*>): Task {
val result = super.configure(config) val result = super.configure(config)
val konanHomePath = project.findProperty("org.jetbrains.kotlin.native.home") ?: "dist" val konanHome = project.kotlinNativeDist
val konanHome = project.rootProject.file(konanHomePath)
val suffix = if (HostManager.host == KonanTarget.MINGW_X64) ".bat" else "" val suffix = if (HostManager.host == KonanTarget.MINGW_X64) ".bat" else ""
val klibProgram = "$konanHome/bin/klib$suffix" val klibProgram = "$konanHome/bin/klib$suffix"