From 3dd25e49651b408beae06aa17933fb81b68a2501 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 17 Mar 2021 20:40:29 +0300 Subject: [PATCH] Revert "Cleanup TargetManager.kt a little bit" This reverts commit a4010c7a --- .../src/org/jetbrains/kotlin/konan/target/TargetManager.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/native/utils/src/org/jetbrains/kotlin/konan/target/TargetManager.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/TargetManager.kt index a8ef2df2c0a..585e164930a 100644 --- a/native/utils/src/org/jetbrains/kotlin/konan/target/TargetManager.kt +++ b/native/utils/src/org/jetbrains/kotlin/konan/target/TargetManager.kt @@ -9,6 +9,8 @@ interface TargetManager { val target: KonanTarget val targetName: String fun list() + val hostTargetSuffix: String + val targetSuffix: String } internal class TargetManagerImpl(val userRequest: String?, val hostManager: HostManager) : TargetManager { @@ -24,7 +26,7 @@ internal class TargetManagerImpl(val userRequest: String?, val hostManager: Host } } - private fun determineCurrent(): KonanTarget { + fun determineCurrent(): KonanTarget { return if (userRequest == null || userRequest == "host") { HostManager.host } else { @@ -32,6 +34,9 @@ internal class TargetManagerImpl(val userRequest: String?, val hostManager: Host hostManager.targets.getValue(hostManager.known(resolvedAlias)) } } + + override val hostTargetSuffix get() = hostTargetSuffix(HostManager.host, target) + override val targetSuffix get() = target.name } fun hostTargetSuffix(host: KonanTarget, target: KonanTarget) =