X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fbootstrap%2Fcompile.rs;h=043b38ecece7da5cb58ab42914468bf0543c123a;hb=1591dcb659917de87254297073b078b9ade56612;hp=c0ab093f9524ad8c2a443b08a92a7d45350ec103;hpb=72e36d47e830a175815aba937d8a669d72d028fd;p=rust.git diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index c0ab093f952..043b38ecece 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -1143,7 +1143,6 @@ fn run(self, builder: &Builder<'_>) -> Compiler { let libdir = builder.sysroot_libdir(target_compiler, target_compiler.host); let libdir_bin = libdir.parent().unwrap().join("bin"); t!(fs::create_dir_all(&libdir_bin)); - if let Some(lld_install) = lld_install { let src_exe = exe("lld", target_compiler.host); let dst_exe = exe("rust-lld", target_compiler.host); @@ -1161,17 +1160,11 @@ fn run(self, builder: &Builder<'_>) -> Compiler { } } - // Similarly, copy `llvm-dwp` into libdir for Split DWARF. Only copy it when the LLVM - // backend is used to avoid unnecessarily building LLVM and because LLVM is not checked - // out by default when the LLVM backend is not enabled. if builder.config.rust_codegen_backends.contains(&INTERNER.intern_str("llvm")) { - let src_exe = exe("llvm-dwp", target_compiler.host); - let dst_exe = exe("rust-llvm-dwp", target_compiler.host); let llvm_config_bin = builder.ensure(native::Llvm { target: target_compiler.host }); if !builder.config.dry_run { let llvm_bin_dir = output(Command::new(llvm_config_bin).arg("--bindir")); let llvm_bin_dir = Path::new(llvm_bin_dir.trim()); - builder.copy(&llvm_bin_dir.join(&src_exe), &libdir_bin.join(&dst_exe)); // Since we've already built the LLVM tools, install them to the sysroot. // This is the equivalent of installing the `llvm-tools-preview` component via