From d416417f3653d2c67c68c3b0d347a1028223b285 Mon Sep 17 00:00:00 2001
From: Alexander Gorshenev <alexander.gorshenev@jetbrains.com>
Date: Wed, 19 Sep 2018 18:41:29 +0300
Subject: [PATCH] Fine tuned compiler version compatibility rules for now.

---
 .../jetbrains/kotlin/konan/library/SearchPathResolver.kt | 9 +++++++--
 1 file changed, 7 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 3c86ac7e452..4a93de1f5a9 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
@@ -209,8 +209,8 @@ internal fun SearchPathResolverWithTarget.libraryMatch(candidate: KonanLibraryIm
 
      if (candidateCompilerVersion == null ||
         knownCompilerVersions != null &&
-            !knownCompilerVersions!!.contains(candidateCompilerVersion)) {
-        logger("skipping $candidatePath. The compiler versions don't match. Expected '${knownCompilerVersions?.map { it.toString(true, true) }}', found '${candidateCompilerVersion?.toString(true, true)}'")
+            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
     }
 
@@ -230,3 +230,8 @@ internal fun SearchPathResolverWithTarget.libraryMatch(candidate: KonanLibraryIm
 
     return true
 }
+
+private fun KonanVersion.compatible(other: KonanVersion) =
+        this.major == other.major
+        && this.minor == other.minor
+        && this.maintenance == other.maintenance