Assemble libLLVM into the target lib-dir too

src/bootstrap/compile.rs

@@ -773,6 +773,7 @@ impl Step for Assemble {
         // Ensure that `libLLVM.so` ends up in the newly build compiler directory,
         // so that it can be found when the newly built `rustc` is run.
         dist::maybe_install_llvm_runtime(builder, target_compiler.host, &sysroot);
+        dist::maybe_install_llvm_target(builder, target_compiler.host, &sysroot);
 
         // Link the compiler binary itself into place
         let out_dir = builder.cargo_out(build_compiler, Mode::Rustc, host);

src/bootstrap/dist.rs

@@ -2267,7 +2267,7 @@ fn maybe_install_llvm(builder: &Builder<'_>, target: Interned<String>, dst_libdi
 }
 
 /// Maybe add libLLVM.so to the target lib-dir for linking.
-fn maybe_install_llvm_target(builder: &Builder<'_>, target: Interned<String>, sysroot: &Path) {
+pub fn maybe_install_llvm_target(builder: &Builder<'_>, target: Interned<String>, sysroot: &Path) {
     let dst_libdir = sysroot.join("lib/rustlib").join(&*target).join("lib");
     maybe_install_llvm(builder, target, &dst_libdir);
 }