Skip to content

Commit 6fdc121

Browse files
authored
Rollup merge of #110515 - jyn514:download-rustc-llvm, r=albertlarsan68
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 #110490 (comment), #110263
2 parents dc0de09 + 5a8b189 commit 6fdc121

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

src/bootstrap/dist.rs

-14
Original file line numberDiff line numberDiff line change
@@ -1965,20 +1965,6 @@ fn maybe_install_llvm(builder: &Builder<'_>, target: TargetSelection, dst_libdir
19651965
}
19661966
}
19671967

1968-
// FIXME: for reasons I don't understand, the LLVM so in the `rustc` component is different than the one in `rust-dev`.
1969-
// Only the one in `rustc` works with the downloaded compiler.
1970-
if builder.download_rustc() && target == builder.build.build {
1971-
let src_libdir = builder.ci_rustc_dir(target).join("lib");
1972-
for entry in t!(std::fs::read_dir(&src_libdir)) {
1973-
let entry = t!(entry);
1974-
if entry.file_name().to_str().unwrap().starts_with("libLLVM-") {
1975-
install_llvm_file(builder, &entry.path(), dst_libdir);
1976-
return !builder.config.dry_run();
1977-
}
1978-
}
1979-
panic!("libLLVM.so not found in src_libdir {}!", src_libdir.display());
1980-
}
1981-
19821968
// On macOS, rustc (and LLVM tools) link to an unversioned libLLVM.dylib
19831969
// instead of libLLVM-11-rust-....dylib, as on linux. It's not entirely
19841970
// clear why this is the case, though. llvm-config will emit the versioned

0 commit comments

Comments
 (0)