From 5fb935b3a4e0e9000b60129bfb9a15f573c8ce88 Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Fri, 30 Dec 2022 13:37:59 +0100 Subject: [PATCH] ci/linker: update mold to 1.9 Bump needed for s390x fix with `-gsplit-dwarf` and `--gdb-index`. See the https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20435 for more details. I also switched from make to cmake (make is unsupported now). Additionally disabled build testing and enabled LTO build for Mold. Reviewed-by: Eric Engestrom Signed-off-by: David Heidelberg Part-of: --- .gitlab-ci/container/build-mold.sh | 13 +++++++------ .gitlab-ci/image-tags.yml | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci/container/build-mold.sh b/.gitlab-ci/container/build-mold.sh index 16159df554b..9f23a72a3ca 100644 --- a/.gitlab-ci/container/build-mold.sh +++ b/.gitlab-ci/container/build-mold.sh @@ -1,12 +1,13 @@ -#!/bin/bash +#!/usr/bin/env bash set -ex -MOLD_VERSION="1.6.0" +MOLD_VERSION="1.9.0" git clone -b v"$MOLD_VERSION" --single-branch --depth 1 https://github.com/rui314/mold.git -cd mold -make -make install -cd .. +pushd mold +cmake -DCMAKE_BUILD_TYPE=Release -D BUILD_TESTING=OFF -D MOLD_LTO=ON +cmake --build . --parallel +cmake --install . +popd rm -rf mold diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 5d13f31b5ef..07ed06bba74 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -3,7 +3,7 @@ variables: DEBIAN_BASE_TAG: "2023-01-05-libwayland" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" - DEBIAN_BUILD_TAG: "2022-11-03-ci-fairy-s3" + DEBIAN_BUILD_TAG: "2023-01-06-mold-1_9" DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw" DEBIAN_BUILD_MINGW_TAG: "2023-01-03-ci-libva-2.17"