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 <[email protected]>
brad0 · Apr 29, 2020 · 9c76047 · 9c76047
1 parent 512be78
commit 9c76047
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 12 deletions.
diff --git a/coin/instructions/coin_module_build_template_v2.yaml b/coin/instructions/coin_module_build_template_v2.yaml
@@ -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
diff --git a/coin/instructions/coin_qtbase_build_template_v2.yaml b/coin/instructions/coin_qtbase_build_template_v2.yaml
@@ -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