AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci/deqp-runner: unset CC for arm32 cross-compilation

Browse Source 
When CC variable is set to /usr/lib/ccache/gcc, the rust
compiler uses this variable when cross-compiling for arm32,
which causes build failure for zstd-sys. So unset the CC
variable when cross-compiling for arm32.

Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29931>
This commit is contained in:
Vignesh Raman
2024-07-22 07:33:26 +05:30
committed by Marge Bot
parent 8f9a157daa
commit 6edfb09dda
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci/container/build-deqp-runner.sh
+6
View File
@@ -34,6 +34,12 @@ else
fi fi
if [[ "$RUST_TARGET" != *-android ]]; then 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.
if [ "$RUST_TARGET" = "armv7-unknown-linux-gnueabihf" ]; then
unset CC
fi
cargo install --locked \ cargo install --locked \
-j ${FDO_CI_CONCURRENT:-4} \ -j ${FDO_CI_CONCURRENT:-4} \
--root /usr/local \ --root /usr/local \