Skip to content

Commit 21bd9ee

Browse files
committedOct 24, 2020
Use own mirror for linux headers in musl-toolchain CI script.
1 parent 7bade6e commit 21bd9ee

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed
 

‎src/ci/docker/scripts/musl-toolchain.sh

+8-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
# Versions of the toolchain components are configurable in `musl-cross-make/Makefile` and
55
# musl unlike GLIBC is forward compatible so upgrading it shouldn't break old distributions.
66
# Right now we have: Binutils 2.31.1, GCC 9.2.0, musl 1.1.24.
7+
8+
# ignore-tidy-linelength
9+
710
set -ex
811

912
hide_output() {
@@ -26,6 +29,9 @@ exit 1
2629
ARCH=$1
2730
TARGET=$ARCH-linux-musl
2831

32+
# Don't depend on the mirrors of sabotage linux that musl-cross-make uses.
33+
LINUX_HEADERS_SITE=https://ci-mirrors.rust-lang.org/rustc/sabotage-linux-tarballs
34+
2935
OUTPUT=/usr/local
3036
shift
3137

@@ -38,8 +44,8 @@ cd musl-cross-make
3844
# A few commits ahead of v0.9.9 to include the cowpatch fix:
3945
git checkout a54eb56f33f255dfca60be045f12a5cfaf5a72a9
4046

41-
hide_output make -j$(nproc) TARGET=$TARGET MUSL_VER=1.1.24
42-
hide_output make install TARGET=$TARGET MUSL_VER=1.1.24 OUTPUT=$OUTPUT
47+
hide_output make -j$(nproc) TARGET=$TARGET MUSL_VER=1.1.24 LINUX_HEADERS_SITE=$LINUX_HEADERS_SITE
48+
hide_output make install TARGET=$TARGET MUSL_VER=1.1.24 LINUX_HEADERS_SITE=$LINUX_HEADERS_SITE OUTPUT=$OUTPUT
4349

4450
cd -
4551

0 commit comments

Comments
 (0)