From 364bffd2c46bacb01a9935c3bb41badf105b9aa1 Mon Sep 17 00:00:00 2001
From: Tero Heikkinen <tero.heikkinen@qt.io>
Date: Fri, 24 Nov 2023 15:00:16 +0200
Subject: [PATCH] Coin: Add native MSVC ARM64 instructions

Task-number: QTQAINFRA-5855
Pick-to: 6.6
Change-Id: I95a3b5f44c2513becb0bdbd5f56c0a5e36e889d9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 8dffb3c5e3cf419d8428b09d433d199e5dbff904)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 coin/instructions/prepare_building_env.yaml | 23 ++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml
index b689eb34c75..2cf7740b01a 100644
--- 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.