bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #91720 - Aaron1011:skip-llvm-ci-tools, r=Mark-Simulacrum

Browse source 
Don't copy llvm tools to sysroot when using download-ci-llvm

Fixes #91710
This commit is contained in:
bors 2021-12-11 06:58:24 +00:00
commit 4a66a704b2
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/bootstrap/compile.rs
View file

@ -1173,7 +1173,12 @@ impl Step for Assemble {
// (e.g. the `bootimage` crate).
for tool in LLVM_TOOLS {
let tool_exe = exe(tool, target_compiler.host);
builder.copy(&llvm_bin_dir.join(&tool_exe), &libdir_bin.join(&tool_exe));
let src_path = llvm_bin_dir.join(&tool_exe);
// When using `donwload-ci-llvm`, some of the tools
// may not exist, so skip trying to copy them.
if src_path.exists() {
builder.copy(&src_path, &libdir_bin.join(&tool_exe));
}
}
}
}