From 544447e67e3ce16ecb08b80a06c1e2b750714166 Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Wed, 26 Jan 2022 17:26:10 +0300 Subject: [PATCH] Native: do not cache DependencyDirectories.localKonanDir Caching is wrong when this code is running in Gradle daemon, because the daemon can change the environment, while localKonanDir depends on the environment. --- .../org/jetbrains/kotlin/konan/util/DependencyDirectories.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/native/utils/src/org/jetbrains/kotlin/konan/util/DependencyDirectories.kt b/native/utils/src/org/jetbrains/kotlin/konan/util/DependencyDirectories.kt index 3f838a60668..39edf08f295 100644 --- a/native/utils/src/org/jetbrains/kotlin/konan/util/DependencyDirectories.kt +++ b/native/utils/src/org/jetbrains/kotlin/konan/util/DependencyDirectories.kt @@ -8,9 +8,8 @@ package org.jetbrains.kotlin.konan.util import java.io.File object DependencyDirectories { - 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