From b002d572fb57048088371030d7f0c2887073ce24 Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Mon, 27 May 2019 14:30:09 +0300
Subject: [PATCH] Gradle, native: Correct path to LLVM in K/N tool runner

Currently we have the same directory as llvmHome and targetToolchain
but strictly speaking we need to use llvmHome.
---
 .../jetbrains/kotlin/compilerRunner/KotlinNativeToolRunner.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 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 7cd6c5b22e9..84a18d979a5 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
@@ -160,11 +160,11 @@ internal class KonanInteropRunner(project: Project, additionalJvmArgs: List<Stri
     KonanCliRunner("cinterop", "Kotlin/Native cinterop tool", project, additionalJvmArgs) {
     init {
         if (HostManager.host == KonanTarget.MINGW_X64) {
-            // TODO: Read it from KonanDistribution when it is accessible.
+            // TODO: Read it from Platform properties 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")
+            val toolchainDir = konanProperties.getProperty("llvmHome.mingw_x64")
             if (toolchainDir != null) {
                 environment.put(
                     "PATH",