From 5903d015b8783c92e710754a51ea26c999fd64d2 Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Thu, 15 Apr 2021 13:24:08 +0300 Subject: [PATCH] [native][tests] Change architecture requirements in simulator executor This requirement doesn't work for watchos_x86 on macos_x64 so create a list of compatible requirements. --- .../src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt index e605a3a4fa8..fc7b3172fd7 100644 --- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt +++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt @@ -229,7 +229,11 @@ private fun simulator(project: Project): ExecutorService = object : ExecutorServ require(configurables.targetTriple.isSimulator) { "${configurables.target} is not a simulator." } - require(HostManager.host.architecture == configurables.target.architecture) { + val compatibleArchs = when (HostManager.host.architecture) { + is Architecture.X64 -> listOf(Architecture.X64, Architecture.X86) + is Architecture.ARM64 -> listOf(Architecture.ARM64, Architecture.ARM32) + } + require(configurables.target.architecture in compatibleArchs) { "Can't run simulator with ${configurables.target.architecture} architecture." } }