Skip to content

Commit 5b0d2e8

Browse files
semlanikQt Cherry-pick Bot
authored andcommitted
Disable top-level configure run for the cross-builds
The 'target' configurations currently trigger the 'host' configure command line, and are duplication of the existing rule we have for the host machines. Disable the top-level configure checks for the 'target' builds completely. Fixes: QTBUG-132799 Pick-to: 6.8 Change-Id: Ia06dde53825e882e78a8c6be9e62779aaedcebf4 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 6f0c6b1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
1 parent 81f7f5b commit 5b0d2e8

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

coin/instructions/coin_qt_configure.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,20 @@ instructions:
4747
condition: property
4848
property: features
4949
contains_value: UseConfigure
50+
disable_if:
51+
condition: or
52+
conditions:
53+
- condition: property
54+
property: target.osVersion
55+
in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY, VxWorks]
56+
- condition: and
57+
conditions:
58+
- condition: property
59+
property: target.os
60+
equals_value: Windows
61+
- condition: property
62+
property: target.arch
63+
not_equals_property: host.arch
64+
- condition: property
65+
property: features
66+
not_contains_value: "DebianPackaging"

0 commit comments

Comments
 (0)