diff options
| author | Eric Anholt <[email protected]> | 2020-03-11 11:11:19 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2020-03-17 10:44:39 -0700 |
| commit | 8997757c6abfe657a259bc5c681628e70792b67a (patch) | |
| tree | 883eff23fb7810cbde4fbebc5ec298f9f964564e /.gitlab-ci | |
| parent | ba39cc5e85ef3b2c14803d21f6fe437620432227 (diff) | |
ci: Enable ccaching of CMake builds as well.
They ignore $PATH for unknown reasons, so you have to force the ccache
wrapping yourself.
Reviewed-by: Michel Dänzer <[email protected]>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4099>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4099>
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/container/container_pre_build.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitlab-ci/container/container_pre_build.sh b/.gitlab-ci/container/container_pre_build.sh index daae18fccb9..725a8b5ed4a 100755 --- a/.gitlab-ci/container/container_pre_build.sh +++ b/.gitlab-ci/container/container_pre_build.sh @@ -5,4 +5,9 @@ export CCACHE_COMPRESS=true export CCACHE_DIR=/cache/mesa/ccache export PATH=/usr/lib/ccache:$PATH +# CMake ignores $PATH, so we have to force CC/GCC to the ccache versions. +# Watch out, you can't have spaces in here because the renderdoc build fails. +export CC="/usr/lib/ccache/gcc" +export CXX="/usr/lib/ccache/g++" + ccache --show-stats |