From 5503b12a170fe14071f07b851db77506541d777c Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Fri, 26 Apr 2019 14:16:48 +0700 Subject: [PATCH] Add filtering for standard KLIBs --- .../org/jetbrains/kotlin/konan/library/SearchPathResolver.kt | 4 +++- .../kotlin/konan/library/impl/KonanLibraryLayoutImpl.kt | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt b/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt index b1f1a10533d..653f41929f2 100644 --- a/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt +++ b/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt @@ -159,9 +159,11 @@ internal open class KonanLibrarySearchPathResolver( if (!noDefaultLibs) { val defaultLibs = defaultRoots.flatMap { it.listFiles } + .asSequence() + .filterNot { it.name.startsWith('.') } .filterNot { it.name.removeSuffixIfPresent(KLIB_FILE_EXTENSION_WITH_DOT) == KONAN_STDLIB_NAME } .map { UnresolvedLibrary(it.absolutePath, null) } - .map {resolve(it, isDefaultLink = true) } + .map { resolve(it, isDefaultLink = true) } result.addAll(defaultLibs) } diff --git a/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryLayoutImpl.kt b/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryLayoutImpl.kt index def00ea7053..3be1b156cce 100644 --- a/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryLayoutImpl.kt +++ b/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryLayoutImpl.kt @@ -37,7 +37,9 @@ internal fun zippedKonanLibraryChecks(klibFile: File) { check(klibFile.isFile) { "Expected $klibFile to be a regular file." } val extension = klibFile.extension - check(extension.isEmpty() || extension == KLIB_FILE_EXTENSION) { "Unexpected file extension: $extension" } + check(extension.isEmpty() || extension == KLIB_FILE_EXTENSION) { + "KLIB path has unexpected extension: $klibFile" + } } private class UnzippedKonanLibraryLayout(override val libDir: File, override val target: KonanTarget?): KonanLibraryLayoutImpl {