diff options
| author | Jubilee <workingjubilee@gmail.com> | 2025-02-20 14:58:21 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-20 14:58:21 -0800 |
| commit | 02ceb5fb522fd53e3b99e964fb4dc14334beec7a (patch) | |
| tree | 2a36c32b412666439af0d3bf651cfcb1621a1595 | |
| parent | 8aa75f5ec6c0e0516dfe958f2858b78f757db8cc (diff) | |
| parent | d2203ad59c67a6acb2968ea77e1e9dea5530e518 (diff) | |
| download | rust-02ceb5fb522fd53e3b99e964fb4dc14334beec7a.tar.gz rust-02ceb5fb522fd53e3b99e964fb4dc14334beec7a.zip | |
Rollup merge of #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 #137332
| -rw-r--r-- | src/bootstrap/src/core/config/config.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/src/lib.rs | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs index 64a510240f8..172b8d78764 100644 --- a/src/bootstrap/src/core/config/config.rs +++ b/src/bootstrap/src/core/config/config.rs @@ -2767,7 +2767,7 @@ impl Config { ), )] pub(crate) fn update_submodule(&self, relative_path: &str) { - if !self.submodules() { + if self.rust_info.is_from_tarball() || !self.submodules() { return; } diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs index dfaf0418d9a..a0934a8d556 100644 --- a/src/bootstrap/src/lib.rs +++ b/src/bootstrap/src/lib.rs @@ -481,6 +481,10 @@ impl Build { ), )] 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 // submodules. Almost all Steps work fine without their submodules. if cfg!(test) && !self.config.submodules() { |
