From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 24 Oct 2024 09:27:16 +0000 (+0900)
Subject: github: drop workaround and use distro mold
X-Git-Tag: v256.10~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1bb888536b120d37c30899935f5dcf13690150df;p=thirdparty%2Fsystemd.git

github: drop workaround and use distro mold

Now, ubuntu-24.04 has mold-2.30.0+dfsg-1build1 .
See https://packages.ubuntu.com/noble/mold .

(cherry picked from commit f85213e8f65969b7bf0cf198ee2ac2fc014aaf5d)
---

diff --git a/.github/workflows/build_test.sh b/.github/workflows/build_test.sh
index 8a4bb5d1e06..113af704a80 100755
--- a/.github/workflows/build_test.sh
+++ b/.github/workflows/build_test.sh
@@ -47,7 +47,7 @@ PACKAGES=(
     libxkbcommon-dev
     libxtables-dev
     libzstd-dev
-    # mold
+    mold
     mount
     net-tools
     python3-evdev
@@ -70,14 +70,6 @@ LINKER="${LINKER:?}"
 CRYPTOLIB="${CRYPTOLIB:?}"
 RELEASE="$(lsb_release -cs)"
 
-# mold-2.2.0+ fixes some bugs breaking bootloader builds.
-# TODO: Switch to distro mold with ubuntu-24.04
-if [[ "$LINKER" == mold ]]; then
-    wget https://github.com/rui314/mold/releases/download/v2.2.0/mold-2.2.0-x86_64-linux.tar.gz
-    echo "d66e0230c562c2ba0e0b789cc5034e0fa2369cc843d0154920de4269cd94afeb  mold-2.2.0-x86_64-linux.tar.gz" | sha256sum -c
-    sudo tar -xz -C /usr --strip-components=1 -f mold-2.2.0-x86_64-linux.tar.gz
-fi
-
 # Note: As we use postfixed clang/gcc binaries, we need to override $AR
 #       as well, otherwise meson falls back to ar from binutils which
 #       doesn't work with LTO