From c50ae1ffe6899dd124fc0ee56e96cb267f7cb3b4 Mon Sep 17 00:00:00 2001 From: Sergey Bogolepov Date: Sun, 22 Aug 2021 14:44:19 +0700 Subject: [PATCH] [K/N] Don't check for MSVC on Linux and macOS hosts --- .../org/jetbrains/kotlin/konan/target/Windows.kt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Windows.kt b/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Windows.kt index 86381d10ebc..089a0b03be1 100644 --- a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Windows.kt +++ b/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Windows.kt @@ -34,11 +34,19 @@ class MingwConfigurablesImpl(target: KonanTarget, properties: Properties, baseDi } } - override val dependencies - get() = super.dependencies + when (windowsSdkPartsProvider) { + private val windowsHostDependencies by lazy { + when (windowsSdkPartsProvider) { WindowsSdkPartsProvider.InternalServer -> listOf(windowsKitParts, msvcParts) WindowsSdkPartsProvider.Local -> emptyList() } + } + + override val dependencies + get() = super.dependencies + if (HostManager.hostIsMingw) { + windowsHostDependencies + } else { + emptyList() + } } private fun createCustomWindowsKitPath(windowsKitParts: Path): WindowsKit.CustomPath {