Skip to content

Commit 009a84f

Browse files
authored
Rollup merge of #138395 - Kobzol:ci-download-gcc, r=Mark-Simulacrum
Download GCC from CI on test builders This should reduce the duration of the `x86_64-gnu-llvm-18` job, which runs on PR CI, which is currently the only one that builds GCC (outside of the x64 dist builder). Since we handle the GCC download in the GCC step, and not eagerly in config, we can set this flag globally across all test builders, as it won't do anything unless they actually try to build GCC. Opening as a draft to test if it works on CI, because I still need to implement logic to avoid the download if there are any local modifications to GCC (essentially the "if-unchanged" mode, although I want to try something a bit different). r? ```@ghost```
2 parents deb9479 + d4011ae commit 009a84f

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

bootstrap.example.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
# Note that this will attempt to download GCC even if there are local
181181
# modifications to the `src/gcc` submodule.
182182
# Currently, this is only supported for the `x86_64-unknown-linux-gnu` target.
183-
# download-ci-gcc = false
183+
#download-ci-gcc = false
184184

185185
# =============================================================================
186186
# General build configuration options

src/ci/run.sh

+3
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,9 @@ else
183183
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set llvm.static-libstdcpp"
184184
fi
185185

186+
# Download GCC from CI on test builders
187+
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set gcc.download-ci-gcc=true"
188+
186189
if [ "$NO_DOWNLOAD_CI_RUSTC" = "" ]; then
187190
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.download-rustc=if-unchanged"
188191
fi

0 commit comments

Comments
 (0)