From 1d3e72cef405e3965e79a64b5fe6a75206977612 Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Tue, 25 Jan 2022 16:27:13 +0300 Subject: [PATCH] Native: do not cache DependencyProcessor.localKonanDir Caching is wrong when the compiler is working in Gradle daemon, because the daemon can change the environment, while localKonanDir depends on the environment. --- .../org/jetbrains/kotlin/konan/util/DependencyProcessor.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DependencyProcessor.kt b/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DependencyProcessor.kt index 08817b62597..1eed3d131a8 100644 --- a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DependencyProcessor.kt +++ b/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DependencyProcessor.kt @@ -222,9 +222,8 @@ class DependencyProcessor(dependenciesRoot: File, } companion object { - val localKonanDir: File by lazy { - File(System.getenv("KONAN_DATA_DIR") ?: (System.getProperty("user.home") + File.separator + ".konan")) - } + val localKonanDir: File + get() = File(System.getenv("KONAN_DATA_DIR") ?: (System.getProperty("user.home") + File.separator + ".konan")) @JvmStatic val defaultDependenciesRoot: File