whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Instruction selection fix for qemu cross-builds 

When building for qemu, the target "os" is still set to Linux, so try to
detect qemu by looking at the version field.

Change-Id: I7c66cdb29a47a44d5b8a394977136139fc646155
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
bb10
Simon Hausmann 2020-04-27 13:24:19 +02:00
parent 512be78e01
commit 9c76047b07
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
coin/instructions/coin_module_build_template_v2.yaml
View File

@ -6,13 +6,23 @@ instructions:
- !include "{{qt/qtbase}}/cmake_module_build_instructions.yaml"
- !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml"
enable_if:
condition: property
property: host.os
equals_property: target.os
condition: and
conditions:
- condition: property
property: host.os
equals_property: target.os
- condition: property
property: target.osVersion
not_equals_value: QEMU
- type: Group
instructions:
- !include "{{qt/qtbase}}/cmake_cross_compilation_module_build_instructions.yaml"
disable_if:
condition: property
property: host.os
equals_property: target.os
condition: and
conditions:
- condition: property
property: host.os
equals_property: target.os
- condition: property
property: target.osVersion
not_equals_value: QEMU

22
coin/instructions/coin_qtbase_build_template_v2.yaml
View File

@ -6,13 +6,23 @@ instructions:
- !include "{{qt/qtbase}}/cmake_qtbase_build_instructions.yaml"
- !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml"
enable_if:
condition: property
property: host.os
equals_property: target.os
condition: and
conditions:
- condition: property
property: host.os
equals_property: target.os
- condition: property
property: target.osVersion
not_equals_value: QEMU
- type: Group
instructions:
- !include "{{qt/qtbase}}/cmake_cross_compilation_qtbase_build_instructions.yaml"
disable_if:
condition: property
property: host.os
equals_property: target.os
condition: and
conditions:
- condition: property
property: host.os
equals_property: target.os
- condition: property
property: target.osVersion
not_equals_value: QEMU