From cc6185fb2b3d5df433aaf69fb6596c55f2361ba3 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 15 Dec 2021 19:17:41 +0100 Subject: coin: Fix sccache to be used when cross-compiling tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Was likely an oversight. Amends 9f559699cc5dbba9ef8e6da06d2ed48a8b6729a6 Pick-to: 6.2 6.3 Change-Id: I13c2e4cc32e68c1ce98f59a932e3448250b0679b Reviewed-by: Tor Arne Vestbø --- coin/instructions/prepare_building_env.yaml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'coin') diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml index c4d7b2bf59..167cf81a72 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 -- cgit v1.2.1