Skip to content

Commit 4a66a70

Browse files
committed
Auto merge of #91720 - Aaron1011:skip-llvm-ci-tools, r=Mark-Simulacrum
Don't copy llvm tools to sysroot when using download-ci-llvm Fixes #91710
2 parents c185610 + faf407d commit 4a66a70

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/bootstrap/compile.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -1173,7 +1173,12 @@ impl Step for Assemble {
11731173
// (e.g. the `bootimage` crate).
11741174
for tool in LLVM_TOOLS {
11751175
let tool_exe = exe(tool, target_compiler.host);
1176-
builder.copy(&llvm_bin_dir.join(&tool_exe), &libdir_bin.join(&tool_exe));
1176+
let src_path = llvm_bin_dir.join(&tool_exe);
1177+
// When using `donwload-ci-llvm`, some of the tools
1178+
// may not exist, so skip trying to copy them.
1179+
if src_path.exists() {
1180+
builder.copy(&src_path, &libdir_bin.join(&tool_exe));
1181+
}
11771182
}
11781183
}
11791184
}

0 commit comments

Comments
 (0)