Skip to content

Commit f6cd6ea

Browse files
authored
Unrolled build for rust-lang#137338
Rollup merge of rust-lang#137338 - onur-ozkan:137332, r=Kobzol skip submodule updating logics on tarballs Running submodule logic on tarballs isn't necessary since git isn't available there. Fixes rust-lang#137332
2 parents f04bbc6 + d2203ad commit f6cd6ea

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/bootstrap/src/core/config/config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2767,7 +2767,7 @@ impl Config {
27672767
),
27682768
)]
27692769
pub(crate) fn update_submodule(&self, relative_path: &str) {
2770-
if !self.submodules() {
2770+
if self.rust_info.is_from_tarball() || !self.submodules() {
27712771
return;
27722772
}
27732773

src/bootstrap/src/lib.rs

+4
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,10 @@ impl Build {
481481
),
482482
)]
483483
pub fn require_submodule(&self, submodule: &str, err_hint: Option<&str>) {
484+
if self.rust_info().is_from_tarball() {
485+
return;
486+
}
487+
484488
// When testing bootstrap itself, it is much faster to ignore
485489
// submodules. Almost all Steps work fine without their submodules.
486490
if cfg!(test) && !self.config.submodules() {

0 commit comments

Comments
 (0)