Add initial support for macos_arm64 host

This commit is contained in:
Sergey Bogolepov
2021-03-19 20:07:02 +07:00
committed by TeamCityServer
parent 4222fb9629
commit 7e18b69e7d
4 changed files with 43 additions and 7 deletions
@@ -43,7 +43,8 @@ class ClangArgs(private val configurables: Configurables) : Configurables by con
private val binDir = when (HostManager.host) {
KonanTarget.LINUX_X64 -> "$absoluteTargetToolchain/bin"
KonanTarget.MINGW_X64 -> "$absoluteTargetToolchain/bin"
KonanTarget.MACOS_X64 -> "$absoluteTargetToolchain/usr/bin"
KonanTarget.MACOS_X64,
KonanTarget.MACOS_ARM64 -> "$absoluteTargetToolchain/usr/bin"
else -> throw TargetSupportException("Unexpected host platform")
}
// TODO: Use buildList
@@ -88,8 +88,9 @@ abstract class KonanPropertiesLoader(override val target: KonanTarget,
}
private fun defaultArchiveTypeByHost(host: KonanTarget): ArchiveType = when (host) {
KonanTarget.LINUX_X64 -> ArchiveType.TAR_GZ
KonanTarget.MACOS_X64 -> ArchiveType.TAR_GZ
KonanTarget.LINUX_X64,
KonanTarget.MACOS_X64,
KonanTarget.MACOS_ARM64 -> ArchiveType.TAR_GZ
KonanTarget.MINGW_X64 -> ArchiveType.ZIP
else -> error("$host can't be a host platform!")
}