summaryrefslogtreecommitdiffstats
path: root/coin/instructions
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2021-12-15 19:17:41 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-12-16 20:18:24 +0000
commit12b5f4be13d5edf72c0243a79e641c743aec6705 (patch)
tree0bff7d275858e9b8f50f21faf8d518b7db810fe2 /coin/instructions
parent08b95d62c8c67578df9980de451ab3c062cf25cd (diff)
coin: Fix sccache to be used when cross-compiling tests
Was likely an oversight. Amends 9f559699cc5dbba9ef8e6da06d2ed48a8b6729a6 Change-Id: I13c2e4cc32e68c1ce98f59a932e3448250b0679b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit cc6185fb2b3d5df433aaf69fb6596c55f2361ba3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'coin/instructions')
-rw-r--r--coin/instructions/prepare_building_env.yaml4
1 files changed, 4 insertions, 0 deletions
diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml
index 8db5bd2e5f..24cd91bd83 100644
--- a/coin/instructions/prepare_building_env.yaml
+++ b/coin/instructions/prepare_building_env.yaml
@@ -370,12 +370,16 @@ instructions:
- type: AppendToEnvironmentVariable
variableName: TEST_CONFIGURE_ARGS
variableValue: " -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
+
- type: AppendToEnvironmentVariable
variableName: TARGET_CONFIGURE_ARGS
variableValue: " -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
- type: AppendToEnvironmentVariable
variableName: NON_QTBASE_TARGET_CONFIGURE_ARGS
variableValue: " -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
+ - type: AppendToEnvironmentVariable
+ variableName: TARGET_TEST_CONFIGURE_ARGS
+ variableValue: " -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
enable_if:
condition: property
property: features