Add fallback value in K/N version computation

2020-03-04 11:33:55 +03:00
parent 3a4e540d44
commit 03c6f13831
1 changed files with 8 additions and 1 deletions
@@ -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"