about summary refs log tree commit diff
path: root/src/bootstrap/native.rs
diff options
context:
space:
mode:
authorJoshua Nelson <jnelson@cloudflare.com>2022-05-03 13:29:37 -0500
committerJoshua Nelson <jnelson@cloudflare.com>2022-05-25 17:32:31 -0500
commit53bf24c82ba2102c84949ed2c2ed94fa972b4c2a (patch)
treef3053b7a8f1d7100f6ec458170e6a379ec52d3d6 /src/bootstrap/native.rs
parent61dd278ade42a2d6d88f1c7b2bf2ee3ffab3b132 (diff)
Move download-rustc from bootstrap.py to rustbuild
- Remove download-rustc handling from bootstrap.py
- Allow a custom `pattern` in `builder.unpack()`
- Only download rustc once another part of bootstrap depends on it.

  This is somewhat necessary since the download functions rely on having a full
  `Builder`, which isn't available until after config parsing finishes.
Diffstat (limited to 'src/bootstrap/native.rs')
-rw-r--r--src/bootstrap/native.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
index 5bb94f297c8..d7211b2c2af 100644
--- a/src/bootstrap/native.rs
+++ b/src/bootstrap/native.rs
@@ -182,7 +182,7 @@ fn download_ci_llvm(builder: &Builder<'_>, llvm_sha: &str) {
         builder.download_component(base, &format!("{}/{}", url, filename), &tarball);
     }
     let llvm_root = builder.config.ci_llvm_root();
-    builder.unpack(&tarball, &llvm_root);
+    builder.unpack(&tarball, &llvm_root, "rust-dev");
 }
 
 #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]