diff options
| author | Tim Diekmann <tim.diekmann@3dvision.de> | 2020-10-25 16:32:28 +0100 |
|---|---|---|
| committer | Tim Diekmann <tim.diekmann@3dvision.de> | 2020-10-25 16:32:28 +0100 |
| commit | 06e4497a04615ad95dff4240ca9980f19ed364ad (patch) | |
| tree | 123a17d04628e05bb2448d1d3e3f11e60f240304 /src/ci/docker/scripts | |
| parent | 693a2bf18b7090202784f561de3dfca45c4f79be (diff) | |
| parent | f392479de6b003e72f93cb8f9955b3cf4135c2cd (diff) | |
| download | rust-06e4497a04615ad95dff4240ca9980f19ed364ad.tar.gz rust-06e4497a04615ad95dff4240ca9980f19ed364ad.zip | |
Merge remote-tracking branch 'upstream/master' into box-alloc
Diffstat (limited to 'src/ci/docker/scripts')
| -rw-r--r-- | src/ci/docker/scripts/musl-toolchain.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/ci/docker/scripts/musl-toolchain.sh b/src/ci/docker/scripts/musl-toolchain.sh index 1ae412340cb..c56338a4f95 100644 --- a/src/ci/docker/scripts/musl-toolchain.sh +++ b/src/ci/docker/scripts/musl-toolchain.sh @@ -4,6 +4,9 @@ # 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.31.1, GCC 9.2.0, musl 1.1.24. + +# ignore-tidy-linelength + set -ex hide_output() { @@ -26,6 +29,9 @@ exit 1 ARCH=$1 TARGET=$ARCH-linux-musl +# Don't depend on the mirrors of sabotage linux that musl-cross-make uses. +LINUX_HEADERS_SITE=https://ci-mirrors.rust-lang.org/rustc/sabotage-linux-tarballs + OUTPUT=/usr/local shift @@ -38,8 +44,8 @@ cd musl-cross-make # A few commits ahead of v0.9.9 to include the cowpatch fix: git checkout a54eb56f33f255dfca60be045f12a5cfaf5a72a9 -hide_output make -j$(nproc) TARGET=$TARGET MUSL_VER=1.1.24 -hide_output make install TARGET=$TARGET MUSL_VER=1.1.24 OUTPUT=$OUTPUT +hide_output make -j$(nproc) TARGET=$TARGET MUSL_VER=1.1.24 LINUX_HEADERS_SITE=$LINUX_HEADERS_SITE +hide_output make install TARGET=$TARGET MUSL_VER=1.1.24 LINUX_HEADERS_SITE=$LINUX_HEADERS_SITE OUTPUT=$OUTPUT cd - |