From ae4a48deccf9cb9ab6f37225f7a05c600ad5e367 Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Tue, 10 Sep 2024 13:29:57 +0300 Subject: [PATCH] Coin: Fix Windows aarch64 cross compile conditions Match to Windows target OS and different target arch, which tells that it is a cross-compilation. Change-Id: Iba2d087cda501cd2622a1bd8a8732100b920956b Reviewed-by: Joerg Bornemann (cherry picked from commit b8521b89dfa36519afe8a7c8f02b982d760fc0f6) Reviewed-by: Qt Cherry-pick Bot --- coin/instructions/coin_module_build_template_v2.yaml | 6 +++--- coin/instructions/coin_qtbase_build_template_v2.yaml | 6 +++--- coin/instructions/prepare_building_env.yaml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/coin/instructions/coin_module_build_template_v2.yaml b/coin/instructions/coin_module_build_template_v2.yaml index e7f47328e8d..a07119b8d50 100644 --- a/coin/instructions/coin_module_build_template_v2.yaml +++ b/coin/instructions/coin_module_build_template_v2.yaml @@ -70,11 +70,11 @@ instructions: - condition: and conditions: - condition: property - property: host.compiler - equals_value: MSVC2019 + property: target.os + equals_value: Windows - condition: property property: target.arch - equals_value: ARM64 + not_equals_property: host.arch - condition: property property: features not_contains_value: "DebianPackaging" diff --git a/coin/instructions/coin_qtbase_build_template_v2.yaml b/coin/instructions/coin_qtbase_build_template_v2.yaml index bcba7427817..e7a8329ffc4 100644 --- a/coin/instructions/coin_qtbase_build_template_v2.yaml +++ b/coin/instructions/coin_qtbase_build_template_v2.yaml @@ -61,11 +61,11 @@ instructions: - condition: and conditions: - condition: property - property: host.compiler - equals_value: MSVC2019 + property: target.os + equals_value: Windows - condition: property property: target.arch - equals_value: ARM64 + not_equals_property: host.arch - condition: property property: features not_contains_value: "DebianPackaging" diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml index b48bd153474..fc6928f08f6 100644 --- a/coin/instructions/prepare_building_env.yaml +++ b/coin/instructions/prepare_building_env.yaml @@ -347,11 +347,11 @@ instructions: condition: and conditions: - condition: property - property: host.compiler - equals_value: MSVC2019 + property: target.os + equals_value: Windows - condition: property property: target.arch - equals_value: ARM64 + not_equals_property: host.arch instructions: - type: EnvironmentVariable variableName: TARGET_ENV_PREFIX