diff options
| author | bors <bors@rust-lang.org> | 2017-10-21 19:02:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-10-21 19:02:41 +0000 |
| commit | 4279e2b4c14dc90191595c97ad3a019d618e7158 (patch) | |
| tree | 86b03abfc480503a53fde1871661e3b6e51510a7 | |
| parent | ff8773d7be45699fe1aa847b83d096e1c00a516b (diff) | |
| parent | b1f246c12eb3a216b807c329f1756131c1f1bc1e (diff) | |
| download | rust-4279e2b4c14dc90191595c97ad3a019d618e7158.tar.gz rust-4279e2b4c14dc90191595c97ad3a019d618e7158.zip | |
Auto merge of #45393 - alexcrichton:update-musl, r=Mark-Simulacrum
ci: Update musl with new release Apparently there's at least one CVE fixed in the new version of musl, and because we're distributing it seems like a good opportunity to update! Unfortunately it looks like #38618 still hasn't been fixed.
| -rwxr-xr-x | src/ci/docker/cross/build-arm-musl.sh | 2 | ||||
| -rw-r--r-- | src/ci/docker/dist-i586-gnu-i686-musl/build-musl.sh | 2 | ||||
| -rw-r--r-- | src/ci/docker/dist-x86_64-musl/build-musl.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/ci/docker/cross/build-arm-musl.sh b/src/ci/docker/cross/build-arm-musl.sh index 780099e2ec1..567e5d9ac98 100755 --- a/src/ci/docker/cross/build-arm-musl.sh +++ b/src/ci/docker/cross/build-arm-musl.sh @@ -11,7 +11,7 @@ set -ex -MUSL=1.1.16 +MUSL=1.1.17 hide_output() { set +x diff --git a/src/ci/docker/dist-i586-gnu-i686-musl/build-musl.sh b/src/ci/docker/dist-i586-gnu-i686-musl/build-musl.sh index ad285a57a84..883859d1fa6 100644 --- a/src/ci/docker/dist-i586-gnu-i686-musl/build-musl.sh +++ b/src/ci/docker/dist-i586-gnu-i686-musl/build-musl.sh @@ -15,7 +15,7 @@ set -ex export CFLAGS="-fPIC -Wa,-mrelax-relocations=no" export CXXFLAGS="-Wa,-mrelax-relocations=no" -MUSL=musl-1.1.16 +MUSL=musl-1.1.17 curl https://www.musl-libc.org/releases/$MUSL.tar.gz | tar xzf - cd $MUSL CC=gcc \ diff --git a/src/ci/docker/dist-x86_64-musl/build-musl.sh b/src/ci/docker/dist-x86_64-musl/build-musl.sh index 776da009397..9be8d001149 100644 --- a/src/ci/docker/dist-x86_64-musl/build-musl.sh +++ b/src/ci/docker/dist-x86_64-musl/build-musl.sh @@ -15,7 +15,7 @@ set -ex export CFLAGS="-fPIC -Wa,-mrelax-relocations=no" export CXXFLAGS="-Wa,-mrelax-relocations=no" -MUSL=musl-1.1.16 +MUSL=musl-1.1.17 curl https://www.musl-libc.org/releases/$MUSL.tar.gz | tar xzf - cd $MUSL ./configure --prefix=/musl-x86_64 --disable-shared |