From 59dcef81f71c30e100ec4d2ed30529b256960f4e Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Mon, 26 Jul 2021 12:47:32 +0300 Subject: [PATCH] [K/N][Gradle] Make sure K/N Gradle plugin don't fail when K/N distribution directory has no platform libs --- .../gradle/targets/native/tasks/KotlinNativeTasks.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 9c79b0d8de5..6b3511a93cd 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 @@ -837,14 +837,15 @@ internal class CacheBuilder(val project: Project, val binary: NativeBinary, val private fun ensureCompilerProvidedLibsPrecached() { val distribution = Distribution(project.konanHome) - val platformLibs = (listOf(File(distribution.stdlib)) + File(distribution.platformLibs(konanTarget)) - .listFiles()).associateBy { it.name } + val platformLibs = mutableListOf().apply { + this += File(distribution.stdlib) + this += File(distribution.platformLibs(konanTarget)).listFiles().orEmpty() + }.associateBy { it.name } val visitedLibs = mutableSetOf() for (platformLibName in platformLibs.keys) ensureCompilerProvidedLibPrecached(platformLibName, platformLibs, visitedLibs) } - fun buildCompilerArgs(): List = mutableListOf().apply { if (konanCacheKind != NativeCacheKind.NONE && !optimized && cacheWorksFor(konanTarget, project)) { rootCacheDirectory.mkdirs()