azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Cleanup TargetManager.kt a little bit"

Browse Source 
This reverts commit a4010c7a
This commit is contained in:
Nikolay Krasko
2021-03-17 20:40:29 +03:00
parent e7a385f9da
commit 3dd25e4965
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/utils/src/org/jetbrains/kotlin/konan/target/TargetManager.kt
+6 -1
View File
@@ -9,6 +9,8 @@ interface TargetManager {
val target: KonanTarget val target: KonanTarget
val targetName: String val targetName: String
fun list() fun list()
val hostTargetSuffix: String
val targetSuffix: String
} }
internal class TargetManagerImpl(val userRequest: String?, val hostManager: HostManager) : TargetManager { 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") { return if (userRequest == null || userRequest == "host") {
HostManager.host HostManager.host
} else { } else {
@@ -32,6 +34,9 @@ internal class TargetManagerImpl(val userRequest: String?, val hostManager: Host
hostManager.targets.getValue(hostManager.known(resolvedAlias)) 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) = fun hostTargetSuffix(host: KonanTarget, target: KonanTarget) =