From 5a8b189aaf74713fb2b8b9cace217197b782dae4 Mon Sep 17 00:00:00 2001 From: jyn Date: Tue, 18 Apr 2023 20:55:42 -0500 Subject: [PATCH] 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`. --- src/bootstrap/dist.rs | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 372d0708c5b..3b35ca1d15d 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -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