Skip to content

Commit

Permalink
Auto merge of rust-lang#61300 - indygreg:upgrade-cross-make, r=sanxiyn
Browse files Browse the repository at this point in the history
Update musl-cross-make to 0.9.8

This version uses musl 1.1.22 and GCC 6.4.0 by default. It also
contains support for newer binutils and GCC versions, should we
want to bump those as well. But I'm purposefully limiting this
patch in order to reduce the surface area for controversy.
  • Loading branch information
bors committed May 31, 2019
2 parents 7840a0b + 51b47b8 commit 041bec8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/ci/docker/scripts/musl-toolchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Versions of the toolchain components are configurable in `musl-cross-make/Makefile` and
# musl unlike GLIBC is forward compatible so upgrading it shouldn't break old distributions.
# Right now we have: Binutils 2.27, GCC 6.3.0, musl 1.1.18
# Right now we have: Binutils 2.27, GCC 6.4.0, musl 1.1.22.
set -ex

hide_output() {
Expand Down Expand Up @@ -33,7 +33,7 @@ shift
# Apparently applying `-fPIC` everywhere allows them to link successfully.
export CFLAGS="-fPIC $CFLAGS"

git clone https://github.com/richfelker/musl-cross-make -b v0.9.7
git clone https://github.com/richfelker/musl-cross-make -b v0.9.8
cd musl-cross-make

hide_output make -j$(nproc) TARGET=$TARGET
Expand Down

0 comments on commit 041bec8

Please sign in to comment.