From 30e9c645f8e1a7983e2ef1713b96e34c2c3348d8 Mon Sep 17 00:00:00 2001 From: Sergey Bogolepov Date: Fri, 19 Mar 2021 11:21:42 +0700 Subject: [PATCH] Revert "Revert "Cleanup TargetManager.kt a little bit"" This reverts commit 3dd25e49 --- .../src/org/jetbrains/kotlin/konan/target/TargetManager.kt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) 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 585e164930a..a8ef2df2c0a 100644 --- a/native/utils/src/org/jetbrains/kotlin/konan/target/TargetManager.kt +++ b/native/utils/src/org/jetbrains/kotlin/konan/target/TargetManager.kt @@ -9,8 +9,6 @@ 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 { @@ -26,7 +24,7 @@ internal class TargetManagerImpl(val userRequest: String?, val hostManager: Host } } - fun determineCurrent(): KonanTarget { + private fun determineCurrent(): KonanTarget { return if (userRequest == null || userRequest == "host") { HostManager.host } else { @@ -34,9 +32,6 @@ 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) =