Skip to content

Commit

Permalink
Auto merge of #91720 - Aaron1011:skip-llvm-ci-tools, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Don't copy llvm tools to sysroot when using download-ci-llvm

Fixes #91710
  • Loading branch information
bors committed Dec 11, 2021
2 parents c185610 + faf407d commit 4a66a70
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/bootstrap/compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}
}
}
Expand Down

0 comments on commit 4a66a70

Please sign in to comment.