ci: when installing mold, make its use automatic
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32046>
This commit is contained in:

committed by
Marge Bot

parent
ba0bb03c84
commit
524231d119
@@ -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.
|
||||
|
@@ -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
|
||||
|
@@ -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"
|
||||
|
Reference in New Issue
Block a user