nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-05 19:58:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #109256 - chaitanyav:fix_108948, r=albertlarsan68

Browse Source 
Check for llvm-tools before install

Fixes #108948
````@jpalus```` Please review
This commit is contained in:
Matthias Krüger 2023-03-18 00:05:55 +01:00 committed by GitHub
commit 01edab6024
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/bootstrap/install.rs
View File

@ -210,10 +210,13 @@ install!((self, builder, _config),
} }
}; };
LlvmTools, alias = "llvm-tools", Self::should_build(_config), only_hosts: true, { LlvmTools, alias = "llvm-tools", Self::should_build(_config), only_hosts: true, {
let tarball = builder if let Some(tarball) = builder.ensure(dist::LlvmTools { target: self.target }) {
.ensure(dist::LlvmTools { target: self.target }) install_sh(builder, "llvm-tools", self.compiler.stage, Some(self.target), &tarball);
.expect("missing llvm-tools"); } else {
install_sh(builder, "llvm-tools", self.compiler.stage, Some(self.target), &tarball); builder.info(
&format!("skipping llvm-tools stage{} ({}): external LLVM", self.compiler.stage, self.target),
);
}
}; };
Rustfmt, alias = "rustfmt", Self::should_build(_config), only_hosts: true, { Rustfmt, alias = "rustfmt", Self::should_build(_config), only_hosts: true, {
if let Some(tarball) = builder.ensure(dist::Rustfmt { if let Some(tarball) = builder.ensure(dist::Rustfmt {