From 79af7268725e83e795c5a5d696c4a2569b6e78a3 Mon Sep 17 00:00:00 2001 From: Igor Chevdar Date: Tue, 9 Jun 2020 16:15:33 +0500 Subject: [PATCH] [native-gradle-plugin] Fixed problem with rebuilding caches --- .../kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt index d7b3c97e0bc..405fc499c37 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt @@ -36,6 +36,7 @@ import org.jetbrains.kotlin.konan.library.KLIB_INTEROP_IR_PROVIDER_IDENTIFIER import org.jetbrains.kotlin.konan.properties.saveToFile import org.jetbrains.kotlin.konan.target.CompilerOutputKind import org.jetbrains.kotlin.konan.target.CompilerOutputKind.* +import org.jetbrains.kotlin.konan.target.Distribution import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.library.* import java.io.File @@ -790,7 +791,9 @@ internal class CacheBuilder(val project: Project, val binary: NativeBinary) { } private fun ensureCompilerProvidedLibsPrecached() { - val platformLibs = libraries.filter { it.providedByCompiler(project) }.associateBy { it.name } + val distribution = Distribution(project.konanHome) + val platformLibs = (listOf(File(distribution.stdlib)) + File(distribution.platformLibs(compilation.konanTarget)) + .listFiles()).associateBy { it.name } val visitedLibs = mutableSetOf() for (platformLibName in platformLibs.keys) ensureCompilerProvidedLibPrecached(platformLibName, platformLibs, visitedLibs)