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

[K/N][Gradle] Make sure K/N Gradle plugin don't fail when K/N distribution directory has no platform libs

Browse Source
This commit is contained in:
Dmitriy Dolovov
2021-07-26 12:47:32 +03:00
parent 66c9d658e4
commit 59dcef81f7
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
+4 -3
View File
@@ -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<File>().apply {
this += File(distribution.stdlib)
this += File(distribution.platformLibs(konanTarget)).listFiles().orEmpty()
}.associateBy { it.name }
val visitedLibs = mutableSetOf<String>()
for (platformLibName in platformLibs.keys)
ensureCompilerProvidedLibPrecached(platformLibName, platformLibs, visitedLibs)
}
fun buildCompilerArgs(): List<String> = mutableListOf<String>().apply {
if (konanCacheKind != NativeCacheKind.NONE && !optimized && cacheWorksFor(konanTarget, project)) {
rootCacheDirectory.mkdirs()