From ca7fde8761df9dc9effb5eb256daf47c776bd3aa Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Tue, 30 Jul 2024 13:03:59 +0200
Subject: [PATCH] ci/deqp-runner: restore CC after temporarily overriding it

Fixes: 6edfb09dda2fc752f6c7 ("ci/deqp-runner: unset CC for arm32 cross-compilation")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30866>
---
 .gitlab-ci/container/build-deqp-runner.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci/container/build-deqp-runner.sh b/.gitlab-ci/container/build-deqp-runner.sh
index 262de547355..44bcf752dc3 100644
--- a/.gitlab-ci/container/build-deqp-runner.sh
+++ b/.gitlab-ci/container/build-deqp-runner.sh
@@ -37,6 +37,7 @@ if [[ "$RUST_TARGET" != *-android ]]; then
     # When CC (/usr/lib/ccache/gcc) variable is set, the rust compiler uses
     # this variable when cross-compiling arm32 and build fails for zsys-sys.
     # So unset the CC variable when cross-compiling for arm32.
+    SAVEDCC=$CC
     if [ "$RUST_TARGET" = "armv7-unknown-linux-gnueabihf" ]; then
         unset CC
     fi
@@ -44,6 +45,7 @@ if [[ "$RUST_TARGET" != *-android ]]; then
         -j ${FDO_CI_CONCURRENT:-4} \
         --root /usr/local \
         ${DEQP_RUNNER_CARGO_ARGS}
+    CC=$SAVEDCC
 else
     mkdir -p /deqp-runner
     pushd /deqp-runner