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

Fine tuned compiler version compatibility rules for now.

Browse Source
This commit is contained in:
Alexander Gorshenev
2018-09-19 18:41:29 +03:00
committed by alexander-gorshenev
parent 5fcb5edac8
commit d416417f36
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt
+7 -2
View File
@@ -209,8 +209,8 @@ internal fun SearchPathResolverWithTarget.libraryMatch(candidate: KonanLibraryIm
if (candidateCompilerVersion == null || if (candidateCompilerVersion == null ||
knownCompilerVersions != null && knownCompilerVersions != null &&
!knownCompilerVersions!!.contains(candidateCompilerVersion)) { knownCompilerVersions!!.none { it.compatible(candidateCompilerVersion) } ) {
logger("skipping $candidatePath. The compiler versions don't match. Expected '${knownCompilerVersions?.map { it.toString(true, true) }}', found '${candidateCompilerVersion?.toString(true, true)}'") logger("skipping $candidatePath. The compiler versions don't match. Expected '${knownCompilerVersions?.map { it.toString(false, false) }}', found '${candidateCompilerVersion?.toString(true, true)}'")
return false return false
} }
@@ -230,3 +230,8 @@ internal fun SearchPathResolverWithTarget.libraryMatch(candidate: KonanLibraryIm
return true return true
} }
private fun KonanVersion.compatible(other: KonanVersion) =
this.major == other.major
&& this.minor == other.minor
&& this.maintenance == other.maintenance