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 2613df0aa8d..3cbafbd33c9 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 @@ -208,18 +208,18 @@ internal fun SearchPathResolverWithTarget.libraryMatch(candidate: KonanLibraryIm return false } - if (candidateCompilerVersion == null || - knownCompilerVersions != null && - knownCompilerVersions!!.none { it.compatible(candidateCompilerVersion) } ) { - logger("skipping $candidatePath. The compiler versions don't match. Expected '${knownCompilerVersions?.map { it.toString(false, false) }}', found '${candidateCompilerVersion?.toString(true, true)}'") - return false - } - if (candidateAbiVersion == null || knownAbiVersions != null && !knownAbiVersions!!.contains(candidateAbiVersion)) { - logger("skipping $candidatePath. The abi versions don't match. Expected '${knownAbiVersions}', found '${candidateAbiVersion}'") - return false + + if (candidateCompilerVersion == null || + knownCompilerVersions != null && + knownCompilerVersions!!.none { it.compatible(candidateCompilerVersion) } ) { + + logger("skipping $candidatePath. The abi versions don't match. Expected '${knownAbiVersions}', found '${candidateAbiVersion}'") + if (knownCompilerVersions != null) logger("The compiler versions don't match either. Expected '${knownCompilerVersions?.map { it.toString(false, false) }}', found '${candidateCompilerVersion?.toString(true, true)}'") + return false + } } if (candidateLibraryVersion != unresolved.libraryVersion &&