diff options
| author | bors <bors@rust-lang.org> | 2023-03-22 09:15:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-22 09:15:00 +0000 |
| commit | 6502613a8199cab4cb68b08c7ddce6f210d8d69c (patch) | |
| tree | 08d66af80486e9e560e3dcbb717b8484740f1b0d | |
| parent | 9bdb4881c7e6061fa8acdbb3ddfcd2dd7e11cc89 (diff) | |
| parent | 40fc42371f04316e882cdfe8bf39b9dd194343ac (diff) | |
| download | rust-6502613a8199cab4cb68b08c7ddce6f210d8d69c.tar.gz rust-6502613a8199cab4cb68b08c7ddce6f210d8d69c.zip | |
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 https://github.com/rust-lang/rust/pull/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
| -rwxr-xr-x | src/ci/run.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ci/run.sh b/src/ci/run.sh index 8ca22d6e68f..fc4ed57fb82 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -60,6 +60,14 @@ RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-cargo-native-static" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-units-std=1" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set dist.compression-profile=best" +# When building for mingw, limit the number of parallel linker jobs during +# the LLVM build, as not to run out of memory. +# This is an attempt to fix the spurious build error tracked by +# https://github.com/rust-lang/rust/issues/108227. +if isWindows && [[ ${CUSTOM_MINGW-0} -eq 1 ]]; then + RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set llvm.link-jobs=4" +fi + # Only produce xz tarballs on CI. gz tarballs will be generated by the release # process by recompressing the existing xz ones. This decreases the storage # space required for CI artifacts. |
