user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #150873 - reenable-gcc-download-ci, r=marcoieni

Browse source 
Reenable GCC CI download

Now that we have the `gcc-dev` artifacts on CI. However, I forgot to bump download-ci-gcc-stamp before 🤦 So I will also have to bump it for this PR.
This commit is contained in:
Matthias Krüger 2026-01-11 09:56:49 +01:00 • committed by GitHub
commit 55383badd3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/bootstrap/download-ci-gcc-stamp
View file

@ -1,4 +1,4 @@
Change this file to make users of the `download-ci-gcc` configuration download
a new version of GCC from CI, even if the GCC submodule hasn’t changed.
Last change is for: https://github.com/rust-lang/rust/pull/138051
Last change is for: https://github.com/rust-lang/rust/pull/150873

2
src/bootstrap/src/core/download.rs
View file

@ -396,7 +396,7 @@ impl Config {
";
self.download_file(&format!("{base}/{gcc_sha}/{filename}"), &tarball, help_on_error);
}
self.unpack(&tarball, root_dir, "gcc");
self.unpack(&tarball, root_dir, "gcc-dev");
}
}

5
src/ci/run.sh
View file

@ -187,9 +187,8 @@ else
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set llvm.static-libstdcpp"
fi
# Download GCC from CI on test builders (temporarily disabled because the CI gcc component
# was renamed).
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set gcc.download-ci-gcc=false"
# Download GCC from CI on test builders
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set gcc.download-ci-gcc=true"
# download-rustc seems to be broken on CI after the stage0 redesign
# Disable it until these issues are debugged and resolved