From 918d47d1101d88e0ae278df8c5c43e923146f121 Mon Sep 17 00:00:00 2001
From: Pavel Punegov <pavel.punegov@jetbrains.com>
Date: Mon, 22 Nov 2021 22:43:44 +0300
Subject: [PATCH] [Native][test] Use Distribution instead

---
 .../src/main/kotlin/org/jetbrains/kotlin/Utils.kt           | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt
index f3c6ea7003d..9a5a48512dd 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt
@@ -228,8 +228,7 @@ val Project.isDefaultNativeHome: Boolean
 private val Project.hasPlatformLibs: Boolean
     get() {
         if (!isDefaultNativeHome) {
-            return project.kotlinNativeDist
-                    .resolve("/klib/platform/${project.testTarget}")
+            return File(buildDistribution(project.kotlinNativeDist.absolutePath).platformLibs(project.testTarget))
                     .exists()
         }
         return false
@@ -238,8 +237,7 @@ private val Project.hasPlatformLibs: Boolean
 private val Project.isCrossDist: Boolean
     get() {
         if (!isDefaultNativeHome) {
-            return project.kotlinNativeDist
-                    .resolve("/klib/stdlib/default/targets/${project.testTarget}")
+            return File(buildDistribution(project.kotlinNativeDist.absolutePath).runtime(project.testTarget))
                     .exists()
         }
         return false