From 6d7e6a25af2e0dc098f561b0259dcade5480bf31 Mon Sep 17 00:00:00 2001 From: onur-ozkan Date: Wed, 4 Oct 2023 22:38:29 +0300 Subject: [PATCH 1/2] vendor distribution on the tarball sources Signed-off-by: onur-ozkan --- src/bootstrap/dist.rs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 32da4ac29a4..56878280e15 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -1001,11 +1001,16 @@ fn run(self, builder: &Builder<'_>) -> GeneratedTarball { channel::write_commit_info_file(&plain_dst_src, info); } - // If we're building from git sources, we need to vendor a complete distribution. - if builder.rust_info().is_managed_git_subrepository() { - // Ensure we have the submodules checked out. - builder.update_submodule(Path::new("src/tools/cargo")); - builder.update_submodule(Path::new("src/tools/rust-analyzer")); + // If we're building from git or tarball sources, we need to vendor + // a complete distribution. + if builder.rust_info().is_managed_git_subrepository() + || builder.rust_info().is_from_tarball() + { + if builder.rust_info().is_managed_git_subrepository() { + // Ensure we have the submodules checked out. + builder.update_submodule(Path::new("src/tools/cargo")); + builder.update_submodule(Path::new("src/tools/rust-analyzer")); + } // Vendor all Cargo dependencies let mut cmd = Command::new(&builder.initial_cargo); From 92ab93fcb555d30cc88a994c98ba28244f0553f8 Mon Sep 17 00:00:00 2001 From: onur-ozkan Date: Fri, 6 Oct 2023 00:16:54 +0300 Subject: [PATCH 2/2] remove the use of `fn update_submodule` on rust-analyzer We don't need to run `fn update_submodule` on rust-analyzer as it's no longer a submodule. Signed-off-by: onur-ozkan --- src/bootstrap/builder/tests.rs | 1 - src/bootstrap/dist.rs | 1 - 2 files changed, 2 deletions(-) diff --git a/src/bootstrap/builder/tests.rs b/src/bootstrap/builder/tests.rs index 80e66622e8b..0294102286e 100644 --- a/src/bootstrap/builder/tests.rs +++ b/src/bootstrap/builder/tests.rs @@ -22,7 +22,6 @@ fn configure_with_args(cmd: &[String], host: &[&str], target: &[&str]) -> Config ..Config::parse(&["check".to_owned()]) }); submodule_build.update_submodule(Path::new("src/doc/book")); - submodule_build.update_submodule(Path::new("src/tools/rust-analyzer")); config.submodules = Some(false); config.ninja_in_file = false; diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 56878280e15..766108a4532 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -1009,7 +1009,6 @@ fn run(self, builder: &Builder<'_>) -> GeneratedTarball { if builder.rust_info().is_managed_git_subrepository() { // Ensure we have the submodules checked out. builder.update_submodule(Path::new("src/tools/cargo")); - builder.update_submodule(Path::new("src/tools/rust-analyzer")); } // Vendor all Cargo dependencies