diff options
| author | Marco A L Barbosa <malbarbo@gmail.com> | 2018-07-05 19:53:36 -0300 |
|---|---|---|
| committer | Marco A L Barbosa <malbarbo@gmail.com> | 2018-07-05 20:17:57 -0300 |
| commit | f969b61bd61d31b4a6f001b7047fd4a192bedd35 (patch) | |
| tree | afec4bb4d274c63a56944ea3c70811f6c8109b8c /src/ci | |
| parent | 94eb1760551096363ec04e42367b6b195592dbd8 (diff) | |
| download | rust-f969b61bd61d31b4a6f001b7047fd4a192bedd35.tar.gz rust-f969b61bd61d31b4a6f001b7047fd4a192bedd35.zip | |
Update musl to 1.1.19 and add patch to fix tls issue
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/scripts/musl.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/ci/docker/scripts/musl.sh b/src/ci/docker/scripts/musl.sh index f87ba8fe4e6..4ca7389d6d1 100644 --- a/src/ci/docker/scripts/musl.sh +++ b/src/ci/docker/scripts/musl.sh @@ -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 |