From a4bd200ea9ed5869d5ce2b6bac531941730da959 Mon Sep 17 00:00:00 2001
From: Svyatoslav Scherbina <svyatoslav.scherbina@jetbrains.com>
Date: Thu, 4 Jun 2020 18:43:29 +0300
Subject: [PATCH] Fix LLVM version in coverage tests

---
 .../main/kotlin/org/jetbrains/kotlin/CoverageTest.kt | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/build-tools/src/main/kotlin/org/jetbrains/kotlin/CoverageTest.kt b/build-tools/src/main/kotlin/org/jetbrains/kotlin/CoverageTest.kt
index 76bf0c44b53..f87535592a9 100644
--- a/build-tools/src/main/kotlin/org/jetbrains/kotlin/CoverageTest.kt
+++ b/build-tools/src/main/kotlin/org/jetbrains/kotlin/CoverageTest.kt
@@ -10,6 +10,7 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.Task
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.TaskAction
+import org.jetbrains.kotlin.konan.target.AppleConfigurables
 
 /**
  * Test task for -Xcoverage and -Xlibraries-to-cover flags. Requires a binary to be built by the Konan plugin
@@ -30,7 +31,14 @@ open class CoverageTest : DefaultTask() {
 
     private val target = project.testTarget
     private val platform = project.platformManager.platform(target)
-    private val llvmBin = "${platform.configurables.absoluteLlvmHome}/bin"
+    private val configurables = platform.configurables
+
+    // Use the same LLVM version as compiler when producing machine code:
+    private val llvmToolsDir = if (configurables is AppleConfigurables) {
+        "${configurables.absoluteTargetToolchain}/usr/bin"
+    } else {
+        "${configurables.absoluteLlvmHome}/bin"
+    }
 
     @Input
     lateinit var binaryName: String
@@ -83,7 +91,7 @@ open class CoverageTest : DefaultTask() {
     }
 
     private fun exec(llvmTool: String, vararg args: String): ProcessOutput {
-        val executable = "$llvmBin/$llvmTool"
+        val executable = "$llvmToolsDir/$llvmTool"
         val result = runProcess(localExecutor(project), executable, args.toList())
         if (result.exitCode != 0) {
             println("""