From 6ec5443aef601ba6b9fe670002575b2a4067fd82 Mon Sep 17 00:00:00 2001
From: Igor Chevdar <igor.chevdar@jetbrains.com>
Date: Tue, 10 Dec 2019 18:57:39 +0300
Subject: [PATCH] Fixed -make-cache option and tests on caches

---
 .../src/org/jetbrains/kotlin/backend/konan/Linker.kt           | 3 +--
 .../src/main/kotlin/org/jetbrains/kotlin/CacheTesting.kt       | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Linker.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Linker.kt
index 462cdb89818..fe28e39fd07 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Linker.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Linker.kt
@@ -41,8 +41,7 @@ internal class Linker(val context: Context) {
     }
 
     private fun renameOutput() {
-        val libraryToAddToCache = context.configuration.get(KonanConfigKeys.LIBRARY_TO_ADD_TO_CACHE)
-        if (context.config.produce.isCache && !libraryToAddToCache.isNullOrEmpty()) {
+        if (context.config.produce.isCache) {
             val outputFiles = context.config.outputFiles
             val outputFile = java.io.File(outputFiles.mainFileMangled)
             val outputDsymBundle = java.io.File(outputFiles.mainFileMangled + ".dSYM")
diff --git a/build-tools/src/main/kotlin/org/jetbrains/kotlin/CacheTesting.kt b/build-tools/src/main/kotlin/org/jetbrains/kotlin/CacheTesting.kt
index 6be1f6c74f3..5b90b34e3dd 100644
--- a/build-tools/src/main/kotlin/org/jetbrains/kotlin/CacheTesting.kt
+++ b/build-tools/src/main/kotlin/org/jetbrains/kotlin/CacheTesting.kt
@@ -49,7 +49,7 @@ fun configureCacheTesting(project: Project): CacheTesting? {
         it.commandLine(
                 "$dist/bin/konanc",
                 "-p", cacheKind.visibleName,
-                "-o", cacheFile,
+                "-o", "stlib-cache",
                 "-Xmake-cache=$stdlib",
                 "-no-default-libs", "-nostdlib",
                 "-g"