Skip to content

Commit

Permalink
Auto merge of #45393 - alexcrichton:update-musl, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed Oct 21, 2017
2 parents ff8773d + b1f246c commit 4279e2b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/ci/docker/cross/build-arm-musl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

set -ex

MUSL=1.1.16
MUSL=1.1.17

hide_output() {
set +x
Expand Down
2 changes: 1 addition & 1 deletion src/ci/docker/dist-i586-gnu-i686-musl/build-musl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion src/ci/docker/dist-x86_64-musl/build-musl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4279e2b

Please sign in to comment.