Skip to content

Commit ae36663

Browse files
committed
Auto merge of #54430 - adrian-budau:master, r=alexcrichton
Update musl to 1.1.20. This fixes #54429
2 parents e7416d5 + 97723db commit ae36663

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

src/ci/docker/scripts/musl.sh

+1-7
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,11 @@ shift
3232

3333
export CFLAGS="-fPIC $CFLAGS"
3434

35-
# FIXME: remove the patch when updating to 1.1.20
36-
MUSL=musl-1.1.19
35+
MUSL=musl-1.1.20
3736

3837
# may have been downloaded in a previous run
3938
if [ ! -d $MUSL ]; then
4039
curl https://www.musl-libc.org/releases/$MUSL.tar.gz | tar xzf -
41-
# Patch to fix https://github.com/rust-lang/rust/issues/48967
42-
cd $MUSL && \
43-
curl "https://git.musl-libc.org/cgit/musl/patch/?id=610c5a8524c3d6cd3ac5a5f1231422e7648a3791" |\
44-
patch -p1 && \
45-
cd -
4640
fi
4741

4842
cd $MUSL

0 commit comments

Comments
 (0)