Rollup merge of #52087 - malbarbo:musl-1.1.19, r=alexcrichton

Update musl to 1.1.19 and add patch to fix tls issue

This fixes https://github.com/rust-lang/rust/issues/48967
This commit is contained in:
Mark Rousskov 2018-07-07 08:27:00 -06:00 committed by GitHub
commit 6cc38a599a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions

View File

@ -32,11 +32,17 @@ shift
export CFLAGS="-fPIC $CFLAGS"
MUSL=musl-1.1.18
# FIXME: remove the patch when upate to 1.1.20
MUSL=musl-1.1.19
# may have been downloaded in a previous run
if [ ! -d $MUSL ]; then
curl https://www.musl-libc.org/releases/$MUSL.tar.gz | tar xzf -
# Patch to fix https://github.com/rust-lang/rust/issues/48967
cd $MUSL && \
curl "https://git.musl-libc.org/cgit/musl/patch/?id=610c5a8524c3d6cd3ac5a5f1231422e7648a3791" |\
patch -p1 && \
cd -
fi
cd $MUSL