From bc89921fdd64a569d410c738e014cd5ad9e006b3 Mon Sep 17 00:00:00 2001
From: Pavel Punegov <pavel.punegov@jetbrains.com>
Date: Tue, 12 Oct 2021 17:10:58 +0300
Subject: [PATCH] [K/N][build] Fix cache location

---
 kotlin-native/build.gradle                                     | 2 +-
 kotlin-native/endorsedLibraries/build.gradle                   | 3 ++-
 .../kotlin/gradle/plugin/konan/tasks/KonanCacheTask.kt         | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kotlin-native/build.gradle b/kotlin-native/build.gradle
index c55684c336d..b449e503102 100644
--- a/kotlin-native/build.gradle
+++ b/kotlin-native/build.gradle
@@ -473,7 +473,7 @@ targetList.each { target ->
             dependsOn "${target}CrossDistStdlib"
             dependsOn ":kotlin-native:platformLibs:${target}StdlibCache"
 
-            destinationDir project.file("$distDir/klib/cache")
+            destinationDir project.file("$distDir/klib/cache/")
 
             from("${project(":kotlin-native:runtime").buildDir}/cache/$target") {
                 include('**')
diff --git a/kotlin-native/endorsedLibraries/build.gradle b/kotlin-native/endorsedLibraries/build.gradle
index 1783cd27ce5..6f5e13a4cf4 100644
--- a/kotlin-native/endorsedLibraries/build.gradle
+++ b/kotlin-native/endorsedLibraries/build.gradle
@@ -78,7 +78,8 @@ targetList.each { target ->
                 originalKlib = library.project.file("build/${target}${library.taskName}")
                 cacheRoot = library.project.file("build/cache/$target").path
                 compilerDistributionPath.set(distDir)
-                cachedLibrary = "${dist}/klib/common/stdlib,${dist}/klib/cache/stdlib-cache"
+                // TODO: should depend on stdlib producer task and its properties
+                cachedLibrary = "${dist}/klib/common/stdlib,${dist}/klib/cache/${target}-gSTATIC/stdlib-cache"
 
                 dependsOn "$library.projectName:${target}${library.taskName}"
                 dependsOn ":kotlin-native:${target}CrossDistRuntime"
diff --git a/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCacheTask.kt b/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCacheTask.kt
index fdc28bf8752..6774515f116 100644
--- a/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCacheTask.kt
+++ b/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCacheTask.kt
@@ -31,8 +31,7 @@ open class KonanCacheTask: DefaultTask() {
     val cacheDirectory: File
         get() = File(cacheRoot).apply {
             if (!exists()) mkdir()
-            resolve("$target-g$cacheKind")
-        }
+        }.resolve("$target-g$cacheKind")
 
     @get:OutputDirectory
     protected val cacheFile: File