]>
Commit | Line | Data |
---|---|---|
a3e679e4 JP |
1 | From 23a34c18f7b2ce8b20fed717ef48e2be1776246b Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= <mkroening@posteo.net> | |
3 | Date: Sun, 11 Dec 2022 12:19:17 +0100 | |
4 | Subject: [PATCH] bootstrap: Allow installing llvm-tools | |
5 | ||
6 | --- | |
7 | src/bootstrap/builder.rs | 1 + | |
8 | src/bootstrap/install.rs | 6 ++++++ | |
9 | 2 files changed, 7 insertions(+) | |
10 | ||
11 | diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs | |
12 | index 8ee6d49da8f0e..3f551dc119b5d 100644 | |
13 | --- a/src/bootstrap/builder.rs | |
14 | +++ b/src/bootstrap/builder.rs | |
15 | @@ -744,6 +744,7 @@ impl<'a> Builder<'a> { | |
16 | install::RustDemangler, | |
17 | install::Clippy, | |
18 | install::Miri, | |
19 | + install::LlvmTools, | |
20 | install::Analysis, | |
21 | install::Src, | |
22 | install::Rustc | |
23 | diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs | |
24 | index 7672b7c913594..c53d0d7e4cb7c 100644 | |
25 | --- a/src/bootstrap/install.rs | |
26 | +++ b/src/bootstrap/install.rs | |
27 | @@ -205,6 +205,12 @@ install!((self, builder, _config), | |
28 | ); | |
29 | } | |
30 | }; | |
31 | + LlvmTools, alias = "llvm-tools", Self::should_build(_config), only_hosts: true, { | |
32 | + let tarball = builder | |
33 | + .ensure(dist::LlvmTools { target: self.target }) | |
34 | + .expect("missing llvm-tools"); | |
35 | + install_sh(builder, "llvm-tools", self.compiler.stage, Some(self.target), &tarball); | |
36 | + }; | |
37 | Rustfmt, alias = "rustfmt", Self::should_build(_config), only_hosts: true, { | |
38 | if let Some(tarball) = builder.ensure(dist::Rustfmt { | |
39 | compiler: self.compiler, |