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

[K/N][build] Small fixes to KonanCacheTask

Browse Source
This commit is contained in:
Pavel Punegov
2021-10-21 11:06:32 +03:00
committed by Space
parent ac5e818c26
commit 567dac0719
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCacheTask.kt
+2 -4
View File
@@ -19,7 +19,6 @@ open class KonanCacheTask: DefaultTask() {
@get:InputDirectory @get:InputDirectory
lateinit var originalKlib: File lateinit var originalKlib: File
// Taken into account by the [cacheFile] property.
@get:Input @get:Input
lateinit var cacheRoot: String lateinit var cacheRoot: String
@@ -29,9 +28,7 @@ open class KonanCacheTask: DefaultTask() {
@get:Internal @get:Internal
// TODO: Reuse NativeCacheKind from Big Kotlin plugin when it is available. // TODO: Reuse NativeCacheKind from Big Kotlin plugin when it is available.
val cacheDirectory: File val cacheDirectory: File
get() = File(cacheRoot).apply { get() = File("$cacheRoot/$target-g$cacheKind")
if (!exists()) mkdir()
}.resolve("$target-g$cacheKind")
@get:OutputDirectory @get:OutputDirectory
val cacheFile: File val cacheFile: File
@@ -62,6 +59,7 @@ open class KonanCacheTask: DefaultTask() {
val deleted = cacheFile.deleteRecursively() val deleted = cacheFile.deleteRecursively()
check(deleted) { "Cannot delete stale cache: ${cacheFile.absolutePath}" } check(deleted) { "Cannot delete stale cache: ${cacheFile.absolutePath}" }
} }
cacheDirectory.mkdirs()
val konanHome = compilerDistributionPath.get().absolutePath val konanHome = compilerDistributionPath.get().absolutePath
val additionalCacheFlags = PlatformManager(konanHome).let { val additionalCacheFlags = PlatformManager(konanHome).let {
it.targetByName(target).let(it::loader).additionalCacheFlags it.targetByName(target).let(it::loader).additionalCacheFlags