Skip to content

Commit 6cc38a5

Browse files
Rollup merge of rust-lang#52087 - malbarbo:musl-1.1.19, r=alexcrichton
Update musl to 1.1.19 and add patch to fix tls issue This fixes rust-lang#48967
2 parents 5a7e0f8 + f969b61 commit 6cc38a5

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/ci/docker/scripts/musl.sh

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

3333
export CFLAGS="-fPIC $CFLAGS"
3434

35-
MUSL=musl-1.1.18
35+
# FIXME: remove the patch when upate to 1.1.20
36+
MUSL=musl-1.1.19
3637

3738
# may have been downloaded in a previous run
3839
if [ ! -d $MUSL ]; then
3940
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 -
4046
fi
4147

4248
cd $MUSL

0 commit comments

Comments
 (0)