diff options
| author | Chris Denton <chris@chrisdenton.dev> | 2025-04-28 01:58:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-28 01:58:47 +0000 |
| commit | 009a84fbe1564c4844e6e3626ef9b26802691593 (patch) | |
| tree | dc9b3c8ccdc0bfefaf1edf7db6b9345a7af5f537 | |
| parent | deb947971c8748f5c6203548ce4af9022f21eaf0 (diff) | |
| parent | d4011ae04372e3b0fb77e28487002c2f05f1b65a (diff) | |
| download | rust-009a84fbe1564c4844e6e3626ef9b26802691593.tar.gz rust-009a84fbe1564c4844e6e3626ef9b26802691593.zip | |
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```
| -rw-r--r-- | bootstrap.example.toml | 2 | ||||
| -rwxr-xr-x | src/ci/run.sh | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/bootstrap.example.toml b/bootstrap.example.toml index 72fd56fb5bd..b8f863bbed1 100644 --- a/bootstrap.example.toml +++ b/bootstrap.example.toml @@ -180,7 +180,7 @@ # Note that this will attempt to download GCC even if there are local # modifications to the `src/gcc` submodule. # Currently, this is only supported for the `x86_64-unknown-linux-gnu` target. -# download-ci-gcc = false +#download-ci-gcc = false # ============================================================================= # General build configuration options diff --git a/src/ci/run.sh b/src/ci/run.sh index 6980d8220e5..b6143af632d 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -183,6 +183,9 @@ else RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set llvm.static-libstdcpp" fi + # Download GCC from CI on test builders + RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set gcc.download-ci-gcc=true" + if [ "$NO_DOWNLOAD_CI_RUSTC" = "" ]; then RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.download-rustc=if-unchanged" fi |