From afdc596121bdd6762226699e1addc9dfa4d223d6 Mon Sep 17 00:00:00 2001 From: Igor Chevdar Date: Fri, 30 Jun 2023 19:32:55 +0300 Subject: [PATCH] [K/N] Fix for two-stage compilation --- .../cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt b/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt index 03f2b799b96..e4df2fab765 100644 --- a/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt +++ b/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt @@ -21,6 +21,7 @@ import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.cli.jvm.plugins.PluginCliParser import org.jetbrains.kotlin.config.* +import org.jetbrains.kotlin.ir.linkage.partial.PartialLinkageConfig import org.jetbrains.kotlin.ir.linkage.partial.partialLinkageConfig import org.jetbrains.kotlin.ir.linkage.partial.setupPartialLinkageConfig import org.jetbrains.kotlin.ir.util.IrMessageLogger @@ -97,6 +98,13 @@ class K2Native : CLICompiler() { it.deleteOnExit() } firstStageConfiguration.put(KonanConfigKeys.OUTPUT, intermediateKLib.absolutePath) + // Empty all cache-related keys. + firstStageConfiguration.put(KonanConfigKeys.CACHE_DIRECTORIES, emptyList()) + firstStageConfiguration.put(KonanConfigKeys.AUTO_CACHEABLE_FROM, emptyList()) + firstStageConfiguration.put(KonanConfigKeys.CACHED_LIBRARIES, emptyMap()) + firstStageConfiguration.put(KonanConfigKeys.AUTO_CACHE_DIR, "") + firstStageConfiguration.put(KonanConfigKeys.INCREMENTAL_CACHE_DIR, "") + firstStageConfiguration.setupPartialLinkageConfig(PartialLinkageConfig.DEFAULT) // Disable PL for KLIB compilation. val firstStageExitCode = executeStage(firstStageConfiguration, arguments, rootDisposable) if (firstStageExitCode != ExitCode.OK)