Auto merge of #54430 - adrian-budau:master, r=alexcrichton

Update musl to 1.1.20. This fixes #54429
rust-lang · Sep 25, 2018 · ae36663 · ae36663
2 parents e7416d5 + 97723db
commit ae36663
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/src/ci/docker/scripts/musl.sh b/src/ci/docker/scripts/musl.sh
@@ -32,17 +32,11 @@ shift
 
 export CFLAGS="-fPIC $CFLAGS"
 
-# FIXME: remove the patch when updating to 1.1.20
-MUSL=musl-1.1.19
+MUSL=musl-1.1.20
 
 # 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