diff options
| author | bors <bors@rust-lang.org> | 2018-09-25 09:33:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-25 09:33:00 +0000 |
| commit | ae366637fedf6f34185e54fc7b2d725b1a458ff6 (patch) | |
| tree | 84cf72a1baa6713202f36cd6ea5c9c69a27ac01b | |
| parent | e7416d565048efdc42efdb143eb7bb0b382f5273 (diff) | |
| parent | 97723db7cf2e19dfd51721d5361c898b52f5a57f (diff) | |
| download | rust-ae366637fedf6f34185e54fc7b2d725b1a458ff6.tar.gz rust-ae366637fedf6f34185e54fc7b2d725b1a458ff6.zip | |
Auto merge of #54430 - adrian-budau:master, r=alexcrichton
Update musl to 1.1.20. This fixes #54429
| -rw-r--r-- | src/ci/docker/scripts/musl.sh | 8 |
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 |