From 03c6f13831f9f3557cf7c0d59bef2355ba2a09b8 Mon Sep 17 00:00:00 2001
From: Kirill Shmakov <kirill.shmakov@jetbrains.com>
Date: Wed, 4 Mar 2020 11:33:55 +0300
Subject: [PATCH] Add fallback value in K/N version computation

---
 .../org/jetbrains/kotlin/konan/target/Distribution.kt    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/native/utils/src/org/jetbrains/kotlin/konan/target/Distribution.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/Distribution.kt
index d99f92f3b43..b990586c6da 100644
--- a/native/utils/src/org/jetbrains/kotlin/konan/target/Distribution.kt
+++ b/native/utils/src/org/jetbrains/kotlin/konan/target/Distribution.kt
@@ -73,7 +73,14 @@ class Distribution(
         result
     }
 
-    val compilerVersion by lazy { properties["compilerVersion"]?.toString() }
+    val compilerVersion by lazy {
+        val propertyVersion = properties["compilerVersion"]?.toString()
+        val bundleVersion = if (konanHome.contains("-1"))
+            konanHome.substring(konanHome.lastIndexOf("-1") + 1)
+        else
+            null
+        propertyVersion ?: bundleVersion
+    }
 
     val klib = "$konanHome/klib"
     val stdlib = "$klib/common/stdlib"