diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-12-17 23:44:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-17 23:44:26 +0100 |
| commit | c6be9a705ffac50b87166bc2ab95647fba34da04 (patch) | |
| tree | 7946440b805a57ac691a30c447030e4f450940c5 /src/bootstrap | |
| parent | 6d1cdcaee52e357dfb3500091bdd18a2e0c763ff (diff) | |
| parent | 23a34c18f7b2ce8b20fed717ef48e2be1776246b (diff) | |
| download | rust-c6be9a705ffac50b87166bc2ab95647fba34da04.tar.gz rust-c6be9a705ffac50b87166bc2ab95647fba34da04.zip | |
Rollup merge of #105559 - mkroening:install-llvm-tools, r=Mark-Simulacrum
bootstrap: Allow installing `llvm-tools` This PR allows installing the `llvm-tools` dist tarball using `./x.py install`.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/builder.rs | 1 | ||||
| -rw-r--r-- | src/bootstrap/install.rs | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 8ee6d49da8f..3f551dc119b 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -744,6 +744,7 @@ impl<'a> Builder<'a> { install::RustDemangler, install::Clippy, install::Miri, + install::LlvmTools, install::Analysis, install::Src, install::Rustc diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs index 7672b7c9135..c53d0d7e4cb 100644 --- a/src/bootstrap/install.rs +++ b/src/bootstrap/install.rs @@ -205,6 +205,12 @@ install!((self, builder, _config), .expect("missing miri"); install_sh(builder, "miri", self.compiler.stage, Some(self.target), &tarball); }; + LlvmTools, alias = "llvm-tools", Self::should_build(_config), only_hosts: true, { + let tarball = builder + .ensure(dist::LlvmTools { target: self.target }) + .expect("missing llvm-tools"); + install_sh(builder, "llvm-tools", self.compiler.stage, Some(self.target), &tarball); + }; Rustfmt, alias = "rustfmt", Self::should_build(_config), only_hosts: true, { if let Some(tarball) = builder.ensure(dist::Rustfmt { compiler: self.compiler, |