Skip to content

Commit

Permalink
Rollup merge of rust-lang#52087 - malbarbo:musl-1.1.19, r=alexcrichton
Browse files Browse the repository at this point in the history
Update musl to 1.1.19 and add patch to fix tls issue

This fixes rust-lang#48967
  • Loading branch information
Mark-Simulacrum authored Jul 7, 2018
2 parents 5a7e0f8 + f969b61 commit 6cc38a5
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/ci/docker/scripts/musl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6cc38a5

Please sign in to comment.