From 2a889ef3500aec91f33041406a9d35293e16938c Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Fri, 14 Dec 2018 20:09:03 +0700
Subject: [PATCH] Don't hardcode a toolchain path for K/N on Windows

---
 .../compilerRunner/KotlinNativeToolRunner.kt  | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinNativeToolRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinNativeToolRunner.kt
index 803d5debc7d..b324dac1dec 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinNativeToolRunner.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinNativeToolRunner.kt
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.konan.KonanVersion
 import org.jetbrains.kotlin.konan.target.HostManager
 import org.jetbrains.kotlin.konan.target.KonanTarget
 import org.jetbrains.kotlin.konan.util.DependencyDirectories
+import java.util.*
 
 /** Copied from Kotlin/Native repository. */
 
@@ -151,12 +152,20 @@ internal class KonanInteropRunner(project: Project, additionalJvmArgs: List<Stri
     KonanCliRunner("cinterop", "Kotlin/Native cinterop tool", project, additionalJvmArgs) {
     init {
         if (HostManager.host == KonanTarget.MINGW_X64) {
-            //TODO: Oh-ho-ho fix it in more convinient way.
-            environment.put(
-                "PATH", DependencyDirectories.defaultDependenciesRoot.absolutePath +
-                        "\\msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1" +
-                        "\\bin;${environment.get("PATH")}"
-            )
+            // TODO: Read it from KonanDistribution when it is accessible.
+            val konanProperties = Properties().apply {
+                project.file("${project.konanHome}/konan/konan.properties").inputStream().use(::load)
+            }
+            val toolchainDir = konanProperties.getProperty("targetToolchain.mingw_x64")
+
+            if (toolchainDir != null) {
+                environment.put(
+                    "PATH",
+                    DependencyDirectories.defaultDependenciesRoot
+                        .resolve("\\$toolchainDir\\bin;${environment.get("PATH")}")
+                        .absolutePath
+                )
+            }
         }
     }
 }