From 524231d119b3cbdc231e78de2eb11df1ab3cc433 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Tue, 5 Nov 2024 19:31:29 +0100
Subject: [PATCH] ci: when installing mold, make its use automatic

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32046>
---
 .gitlab-ci/container/build-deqp.sh | 8 ++++----
 .gitlab-ci/container/build-mold.sh | 5 +++++
 .gitlab-ci/meson/build.sh          | 6 +-----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh
index 26ddac4e051..03dd4ad69a1 100644
--- a/.gitlab-ci/container/build-deqp.sh
+++ b/.gitlab-ci/container/build-deqp.sh
@@ -139,7 +139,7 @@ if [ "${DEQP_API}" = 'GLES' ]; then
         -DDEQP_TARGET=android \
         -DCMAKE_BUILD_TYPE=Release \
         ${EXTRA_CMAKE_ARGS:-}
-    mold --run ninja modules/egl/deqp-egl
+    ninja modules/egl/deqp-egl
     mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-android
   else
     # When including EGL/X11 testing, do that build first and save off its
@@ -148,14 +148,14 @@ if [ "${DEQP_API}" = 'GLES' ]; then
         -DDEQP_TARGET=x11_egl_glx \
         -DCMAKE_BUILD_TYPE=Release \
         ${EXTRA_CMAKE_ARGS:-}
-    mold --run ninja modules/egl/deqp-egl
+    ninja modules/egl/deqp-egl
     mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-x11
 
     cmake -S /VK-GL-CTS -B . -G Ninja \
         -DDEQP_TARGET=wayland \
         -DCMAKE_BUILD_TYPE=Release \
         ${EXTRA_CMAKE_ARGS:-}
-    mold --run ninja modules/egl/deqp-egl
+    ninja modules/egl/deqp-egl
     mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-wayland
   fi
 fi
@@ -191,7 +191,7 @@ if [ "${DEQP_TARGET}" != 'android' ]; then
   deqp_build_targets+=(testlog-to-junit)
 fi
 
-mold --run ninja "${deqp_build_targets[@]}"
+ninja "${deqp_build_targets[@]}"
 
 if [ "${DEQP_TARGET}" != 'android' ]; then
     # Copy out the mustpass lists we want.
diff --git a/.gitlab-ci/container/build-mold.sh b/.gitlab-ci/container/build-mold.sh
index f18bf5f6a4b..d8690c8fe6d 100644
--- a/.gitlab-ci/container/build-mold.sh
+++ b/.gitlab-ci/container/build-mold.sh
@@ -19,5 +19,10 @@ cmake -DCMAKE_BUILD_TYPE=Release -D BUILD_TESTING=OFF -D MOLD_LTO=ON
 cmake --build . --parallel "${FDO_CI_CONCURRENT:-4}"
 cmake --install . --strip
 
+# Always use mold from now on
+find /usr/bin \( -name '*-ld' -o -name 'ld' \) \
+  -exec ln -sf /usr/local/bin/ld.mold {} \; \
+  -exec ls -l {} +
+
 popd
 rm -rf mold
diff --git a/.gitlab-ci/meson/build.sh b/.gitlab-ci/meson/build.sh
index e242d1a451f..1d7f344883e 100755
--- a/.gitlab-ci/meson/build.sh
+++ b/.gitlab-ci/meson/build.sh
@@ -160,11 +160,7 @@ meson configure
 
 uncollapsed_section_switch meson-build "meson: build"
 
-if command -V mold &> /dev/null ; then
-    mold --run ninja
-else
-    ninja
-fi
+ninja
 
 
 uncollapsed_section_switch meson-test "meson: test"