Skip to content

Commit 9475bb4

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)
1 parent 119eb48 commit 9475bb4

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

.github/workflows/build_test.sh

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

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

0 commit comments

Comments
 (0)