Coin: Add native MSVC ARM64 instructions

Task-number: QTQAINFRA-5855 Pick-to: 6.7 6.6 Change-Id: I95a3b5f44c2513becb0bdbd5f56c0a5e36e889d9 Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Toni Saario <[email protected]>
qt · Dec 18, 2023 · 8dffb3c · 8dffb3c
1 parent 0bf7d64
commit 8dffb3c
Showing 1 changed file with 20 additions and 3 deletions.
diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml
@@ -133,9 +133,26 @@ instructions:
  variableName: TARGET_ARCHITECTURE
  variableValue: x64_arm64
  enable_if:
- condition: property
- property: target.arch
- equals_value: ARM64
+ condition: and
+ conditions:
+ - condition: property
+ property: target.arch
+ equals_value: ARM64
+ - condition: property
+ property: host.arch
+ equals_value: X86_64
+ - type: EnvironmentVariable
+ variableName: TARGET_ARCHITECTURE
+ variableValue: arm64
+ enable_if:
+ condition: and
+ conditions:
+ - condition: property
+ property: target.arch
+ in_values: ["AARCH64", "ARM64"]
+ - condition: property
+ property: host
+ equals_property: target
  - type: EnvironmentVariable
  # HACK. Overwrite TARGET_ARCHITECTURE as we do not use standard MSVC cross
  # compilation targets here. The target architecture will be detected by Qt.