Fixed -make-cache option and tests on caches

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) {
-        if (context.config.produce.isCache && !libraryToAddToCache.isNullOrEmpty()) {
             val outputFiles = context.config.outputFiles
             val outputFile = java.io.File(outputFiles.mainFileMangled)
             val outputDsymBundle = java.io.File(outputFiles.mainFileMangled + ".dSYM")

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"