aboutsummaryrefslogtreecommitdiffstats
path: root/.gitlab-ci/debian-install.sh
diff options
context:
space:
mode:
authorMichel Dänzer <[email protected]>2019-09-30 10:36:04 +0200
committerMichel Dänzer <[email protected]>2019-10-01 11:16:33 +0200
commite55df4c8596893ca7258a9f199610d8528d46640 (patch)
tree48055c016f17bb8b517f585ae2c9cf8ba6c0401c /.gitlab-ci/debian-install.sh
parentf83874a4056570ff38f6ee76d044b9eb98836c7a (diff)
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 <[email protected]> Reviewed-by: Dylan Baker <[email protected]>
Diffstat (limited to '.gitlab-ci/debian-install.sh')
-rw-r--r--.gitlab-ci/debian-install.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 63b7270f50d..ef690ce830c 100644
--- 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"