Skip to content

Commit a28fc0b

Browse files
onur-ozkancuviper
authored andcommitted
skip submodule updating logics on tarballs
Signed-off-by: onur-ozkan <work@onurozkan.dev> (cherry picked from commit d2203ad)
1 parent 4d91de4 commit a28fc0b

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2668,7 +2668,7 @@ impl Config {
26682668
/// used instead to provide a nice error to the user if the submodule is
26692669
/// missing.
26702670
pub(crate) fn update_submodule(&self, relative_path: &str) {
2671-
if !self.submodules() {
2671+
if self.rust_info.is_from_tarball() || !self.submodules() {
26722672
return;
26732673
}
26742674

src/bootstrap/src/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,10 @@ impl Build {
471471
/// The given `err_hint` will be shown to the user if the submodule is not
472472
/// checked out and submodule management is disabled.
473473
pub fn require_submodule(&self, submodule: &str, err_hint: Option<&str>) {
474+
if self.rust_info().is_from_tarball() {
475+
return;
476+
}
477+
474478
// When testing bootstrap itself, it is much faster to ignore
475479
// submodules. Almost all Steps work fine without their submodules.
476480
if cfg!(test) && !self.config.submodules() {

0 commit comments

Comments
 (0)