Skip to content

Commit 622998e

Browse files
committed
Specify version of Linux headers
1 parent 21c8c07 commit 622998e

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ TARGET=$ARCH-linux-musl
3232

3333
# Don't depend on the mirrors of sabotage linux that musl-cross-make uses.
3434
LINUX_HEADERS_SITE=https://ci-mirrors.rust-lang.org/rustc/sabotage-linux-tarballs
35+
LINUX_VER=headers-4.19.88
3536

3637
OUTPUT=/usr/local
3738
shift
@@ -47,8 +48,8 @@ cd musl-cross-make
4748
# A version that includes support for building musl 1.2.3
4849
git checkout fe915821b652a7fa37b34a596f47d8e20bc72338
4950

50-
hide_output make -j$(nproc) TARGET=$TARGET MUSL_VER=1.2.3 LINUX_HEADERS_SITE=$LINUX_HEADERS_SITE
51-
hide_output make install TARGET=$TARGET MUSL_VER=1.2.3 LINUX_HEADERS_SITE=$LINUX_HEADERS_SITE OUTPUT=$OUTPUT
51+
hide_output make -j$(nproc) TARGET=$TARGET MUSL_VER=1.2.3 LINUX_HEADERS_SITE=$LINUX_HEADERS_SITE LINUX_VER=$LINUX_VER
52+
hide_output make install TARGET=$TARGET MUSL_VER=1.2.3 LINUX_HEADERS_SITE=$LINUX_HEADERS_SITE LINUX_VER=$LINUX_VER OUTPUT=$OUTPUT
5253

5354
cd -
5455

src/ci/shared.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export MIRRORS_BASE="https://ci-mirrors.rust-lang.org/rustc"
1212
function retry {
1313
echo "Attempting with retry:" "$@"
1414
local n=1
15-
local max=5
15+
local max=1
1616
while true; do
1717
"$@" && break || {
1818
if [[ $n -lt $max ]]; then

0 commit comments

Comments
 (0)