Skip to content

Commit dc1a51c

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 .
1 parent aebfe1b commit dc1a51c

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
@@ -137,20 +137,11 @@ ninja --version
137137
for args in "${ARGS[@]}"; do
138138
SECONDS=0
139139

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

0 commit comments

Comments
 (0)