Skip to content

Commit

Permalink
Auto merge of #61252 - indygreg:upgrade-musl, r=alexcrichton
Browse files Browse the repository at this point in the history
Update musl to 1.1.22

This is the latest available version. I noticed Rust wasn't using the
latest version when I attempted to have Cargo link object files produced
outside of Cargo / Rust's toolchain and was getting missing symbol
errors. Those missing symbols were added in 1.1.21 and 1.1.22.

I'm not fully sure of the implications of this change or how
comprehensive the test coverage is. Upstream changes in 1.1.21 and
1.1.22 can be found at
https://git.musl-libc.org/cgit/musl/tree/WHATSNEW?h=v1.1.22&id=e97681d6f2c44bf5fa9ecdd30607cb63c780062e#n1989.
  • Loading branch information
bors committed Jun 30, 2019
2 parents 3467e21 + aaf6698 commit c06f80a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/ci/docker/scripts/musl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ shift

export CFLAGS="-fPIC $CFLAGS"

MUSL=musl-1.1.20
MUSL=musl-1.1.22

# may have been downloaded in a previous run
if [ ! -d $MUSL ]; then
Expand Down

0 comments on commit c06f80a

Please sign in to comment.