Skip to content

Commit

Permalink
Rollup merge of rust-lang#110515 - jyn514:download-rustc-llvm, r=albe…
Browse files Browse the repository at this point in the history
…rtlarsan68

Don't special-case download-rustc in `maybe_install_llvm`

This is no longer necessary now that the llvm in `rust-dev` matches the one in `rustc`.

cc rust-lang#110490 (comment), rust-lang#110263
  • Loading branch information
matthiaskrgr authored Apr 19, 2023
2 parents dc0de09 + 5a8b189 commit 6fdc121
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions src/bootstrap/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1965,20 +1965,6 @@ fn maybe_install_llvm(builder: &Builder<'_>, target: TargetSelection, dst_libdir
}
}

// FIXME: for reasons I don't understand, the LLVM so in the `rustc` component is different than the one in `rust-dev`.
// Only the one in `rustc` works with the downloaded compiler.
if builder.download_rustc() && target == builder.build.build {
let src_libdir = builder.ci_rustc_dir(target).join("lib");
for entry in t!(std::fs::read_dir(&src_libdir)) {
let entry = t!(entry);
if entry.file_name().to_str().unwrap().starts_with("libLLVM-") {
install_llvm_file(builder, &entry.path(), dst_libdir);
return !builder.config.dry_run();
}
}
panic!("libLLVM.so not found in src_libdir {}!", src_libdir.display());
}

// On macOS, rustc (and LLVM tools) link to an unversioned libLLVM.dylib
// instead of libLLVM-11-rust-....dylib, as on linux. It's not entirely
// clear why this is the case, though. llvm-config will emit the versioned
Expand Down

0 comments on commit 6fdc121

Please sign in to comment.