diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 0f989c0e590..ec12f91434b 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -1547,12 +1547,9 @@ impl Step for Extended {
                 pkgbuild(name);
             };
             prepare("rustc");
-            prepare("cargo");
             prepare("rust-std");
-            prepare("rust-analysis");
             prepare("clippy");
-            prepare("rust-analyzer");
-            for tool in &["rust-docs", "rust-demangler", "miri"] {
+            for tool in &["rust-docs", "rust-demangler", "miri", "cargo", "rust-analysis", "rust-analyzer"] {
                 if built_tools.contains(tool) {
                     prepare(tool);
                 }