squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Auto merge of #76573 - Mark-Simulacrum:bootstrap-with-external-llvm, r=alexcrichton

Browse source 
Only copy LLVM into rust-dev with internal LLVM

This avoids needing to figure out where to locate each of the components with an
external LLVM. This component isn't manifested for rustup consumption and
generally shouldn't matter for anyone except Rust's CI, so it is fine for it to not be
complete elsewhere.

Fixes #76572.

r? `@alexcrichton`
This commit is contained in:
bors 2020-09-11 11:16:33 +00:00
commit d778203da2
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/bootstrap/dist.rs
View file

@ -2524,6 +2524,14 @@ impl Step for RustDev {
fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
let target = self.target;
/* run only if llvm-config isn't used */
if let Some(config) = builder.config.target_config.get(&target) {
if let Some(ref _s) = config.llvm_config {
builder.info(&format!("Skipping RustDev ({}): external LLVM", target));
return None;
}
}
builder.info(&format!("Dist RustDev ({})", target));
let _time = timeit(builder);
let src = builder.src.join("src/llvm-project/llvm");
@ -2536,6 +2544,7 @@ impl Step for RustDev {
// Prepare the image directory
let dst_bindir = image.join("bin");
t!(fs::create_dir_all(&dst_bindir));
let exe = builder.llvm_out(target).join("bin").join(exe("llvm-config", target));
builder.install(&exe, &dst_bindir, 0o755);
builder.install(&builder.llvm_filecheck(target), &dst_bindir, 0o755);