about summary refs log tree commit diff
path: root/src/ci/docker/scripts
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-06-30 08:42:58 +0000
committerbors <bors@rust-lang.org>2019-06-30 08:42:58 +0000
commitc06f80a3c6988d28db43f0cff3f35d9a005c3ad5 (patch)
tree52f3db978f21c5166949ce6159da64b55a3b9eec /src/ci/docker/scripts
parent3467e2120c92ff3f12df51e2b292adbf492ed1e0 (diff)
parentaaf66987931dfe06a547b9f68cb709e9b6265b5c (diff)
downloadrust-c06f80a3c6988d28db43f0cff3f35d9a005c3ad5.tar.gz
rust-c06f80a3c6988d28db43f0cff3f35d9a005c3ad5.zip
Auto merge of #61252 - indygreg:upgrade-musl, r=alexcrichton
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.
Diffstat (limited to 'src/ci/docker/scripts')
-rw-r--r--src/ci/docker/scripts/musl.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/docker/scripts/musl.sh b/src/ci/docker/scripts/musl.sh
index 116c16b2f35..c2cf77d56cb 100644
--- a/src/ci/docker/scripts/musl.sh
+++ b/src/ci/docker/scripts/musl.sh
@@ -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