bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #137338 - onur-ozkan:137332, r=Kobzol

Browse source 
skip submodule updating logics on tarballs

Running submodule logic on tarballs isn't necessary since git isn't available there.

Fixes #137332
This commit is contained in:
Jubilee 2025-02-20 14:58:21 -08:00 • committed by GitHub
commit 02ceb5fb52
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2767,7 +2767,7 @@ impl Config {
), ),
)] )]
pub(crate) fn update_submodule(&self, relative_path: &str) { pub(crate) fn update_submodule(&self, relative_path: &str) {
if !self.submodules() { if self.rust_info.is_from_tarball() || !self.submodules() {
return; return;
} }

4
src/bootstrap/src/lib.rs
View file

@ -481,6 +481,10 @@ impl Build {
), ),
)] )]
pub fn require_submodule(&self, submodule: &str, err_hint: Option<&str>) { pub fn require_submodule(&self, submodule: &str, err_hint: Option<&str>) {
if self.rust_info().is_from_tarball() {
return;
}
// When testing bootstrap itself, it is much faster to ignore // When testing bootstrap itself, it is much faster to ignore
// submodules. Almost all Steps work fine without their submodules. // submodules. Almost all Steps work fine without their submodules.
if cfg!(test) && !self.config.submodules() { if cfg!(test) && !self.config.submodules() {