Skip to content

Commit 6502613

Browse files
committed
Auto merge of #109073 - michaelwoerister:limit-mingw-llvm-link-jobs, r=Mark-Simulacrum
Limit the number of parallel link jobs during LLVM build for mingw. This PR is an attempt to unblock #108355, which keeps failing while trying to link various LLVM artifacts on mingw runners. It looks like doing too many linking jobs might put too much load on the system? (Although I don't understand why the jobs are only failing for #108355 while they seem to pass for others) r? infra-ci
2 parents 9bdb488 + 40fc423 commit 6502613

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

Diff for: src/ci/run.sh

+8
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,14 @@ RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-cargo-native-static"
6060
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-units-std=1"
6161
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set dist.compression-profile=best"
6262

63+
# When building for mingw, limit the number of parallel linker jobs during
64+
# the LLVM build, as not to run out of memory.
65+
# This is an attempt to fix the spurious build error tracked by
66+
# https://github.com/rust-lang/rust/issues/108227.
67+
if isWindows && [[ ${CUSTOM_MINGW-0} -eq 1 ]]; then
68+
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set llvm.link-jobs=4"
69+
fi
70+
6371
# Only produce xz tarballs on CI. gz tarballs will be generated by the release
6472
# process by recompressing the existing xz ones. This decreases the storage
6573
# space required for CI artifacts.

0 commit comments

Comments
 (0)