about summary refs log tree commit diff
path: root/src/ci/docker/scripts
diff options
context:
space:
mode:
authorAdrian Budau <adbudau@bitdefender.com>2018-09-21 17:03:13 +0300
committerAdrian Budau <adbudau@bitdefender.com>2018-09-21 17:03:13 +0300
commit97723db7cf2e19dfd51721d5361c898b52f5a57f (patch)
tree79f44ac5b463f2f3fd8ffb7d47e3acecb9229335 /src/ci/docker/scripts
parent1002e404e1ae6b8b907c8655edd41380d0c561cb (diff)
downloadrust-97723db7cf2e19dfd51721d5361c898b52f5a57f.tar.gz
rust-97723db7cf2e19dfd51721d5361c898b52f5a57f.zip
Update musl to 1.1.20.
Diffstat (limited to 'src/ci/docker/scripts')
-rw-r--r--src/ci/docker/scripts/musl.sh8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/ci/docker/scripts/musl.sh b/src/ci/docker/scripts/musl.sh
index e6a48a96da4..fcebfb93247 100644
--- 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