Skip to content

Commit a2ac569

Browse files
yuwatabluca
authored andcommitted
github: drop workaround for mold and LTO
Now, ubuntu-24.04 has mold-2.30.0+dfsg-1build1 . See https://packages.ubuntu.com/noble/mold . (cherry picked from commit c0b78d2) (cherry picked from commit 0f9ded5)
1 parent 5a5716a commit a2ac569

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

.github/workflows/build_test.sh

+2-11
Original file line numberDiff line numberDiff line change
@@ -142,20 +142,11 @@ for args in "${ARGS[@]}"; do
142142
# It can be safely removed from the CI since it isn't actually used anywhere to test anything.
143143
find . -type f -name meson.build -exec sed -i '/install_tag/d' '{}' '+'
144144

145-
# mold < 1.1 does not support LTO.
146-
if dpkg --compare-versions "$(dpkg-query --showformat='${Version}' --show mold)" ge 1.1; then
147-
fatal "Newer mold version detected, please remove this workaround."
148-
elif [[ "$args" == *"-Db_lto=true"* ]]; then
149-
LD="gold"
150-
else
151-
LD="$LINKER"
152-
fi
153-
154145
info "Checking build with $args"
155146
# shellcheck disable=SC2086
156147
if ! AR="$AR" \
157-
CC="$CC" CC_LD="$LD" CFLAGS="$CFLAGS" \
158-
CXX="$CXX" CXX_LD="$LD" CXXFLAGS="$CXXFLAGS" \
148+
CC="$CC" CC_LD="$LINKER" CFLAGS="$CFLAGS" \
149+
CXX="$CXX" CXX_LD="$LINKER" CXXFLAGS="$CXXFLAGS" \
159150
meson -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true --werror \
160151
-Dnobody-group=nogroup -Dcryptolib="${CRYPTOLIB:?}" \
161152
$args build; then

0 commit comments

Comments
 (0)