gitlab-ci: Set ccache path for cross compilers in meson cross file

Without this, meson didn't pick up ccache for cross builds.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d0e884bce539da14b52eaf4956411edb8c25abc..c9c7af53f427d1cb85a3f8181d553fc837e5c9b4 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@
 # repository's registry will be used there as well.
 variables:
   UPSTREAM_REPO: mesa/mesa
-  DEBIAN_TAG: "2019-09-18"
+  DEBIAN_TAG: "2019-09-30"
   DEBIAN_ARM64_TAG: "arm64v8-2019-08-09"
   STRETCH_TAG: "2019-09-18"
   DEBIAN_VERSION: buster-slim

diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 63b7270f50dfe8eb83b49aeb735e610dff97ad60..ef690ce830c2165cf9ca3395759ece253422614b 100644 (file)
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -199,6 +199,8 @@ apt-get install -y --no-remove libxml2-utils
 for arch in $CROSS_ARCHITECTURES; do
   cross_file="/cross_file-$arch.txt"
   /usr/share/meson/debcrossgen --arch "$arch" -o "$cross_file"
+  # Explicitly set ccache path for cross compilers
+  sed -i "s|/usr/bin/\([^-]*\)-linux-gnu\([^-]*\)-g|/usr/lib/ccache/\\1-linux-gnu\\2-g|g" "$cross_file"
   # Work around a bug in debcrossgen that should be fixed in the next release
   if [ "$arch" = "i386" ]; then
     sed -i "s|cpu_family = 'i686'|cpu_family = 'x86'|g" "$cross_file"