commit 73597fbed0a4ddfcc759ddb802158f2b3914dda0
author bjorn3 <bjorn3@users.noreply.github.com> Sat Feb 20 18:04:31 2021 +0100
committer Erin Power <erin.power@embark-studios.com> Fri Apr 30 15:37:42 2021 +0200
tree 1c8b07f7e16c74fd4890600e6b3a5be7f70c9264
parent 02087c34c4f132dd93d1a534589391f491cc9d91

Fix install location for codegen backends

src/bootstrap/dist.rs

diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index aaa8e85..ef5e0c3 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -1240,14 +1240,13 @@ fn run(self, builder: &Builder<'_>) -> GeneratedTarball {
             .strip_prefix(builder.sysroot_libdir_relative(compiler))
             .unwrap();
         // Don't use custom libdir here because ^lib/ will be resolved again with installer
-        let backends_dst = tarball.image_dir().join("lib").join(&backends_rel);
+        let backends_dst = PathBuf::from("lib").join(&backends_rel);
 
-        t!(fs::create_dir_all(&backends_dst));
         let backend_name = format!("rustc_codegen_{}", backend);
         for backend in fs::read_dir(&backends_src).unwrap() {
             let file_name = backend.unwrap().file_name();
             if file_name.to_str().unwrap().contains(&backend_name) {
-                tarball.add_file(backends_src.join(file_name), backends_rel, 0o644);
+                tarball.add_file(backends_src.join(file_name), &backends_dst, 0o644);
             }
         }
 
@@ -1401,8 +1400,11 @@ fn run(self, builder: &Builder<'_>) {
         let miri_installer = builder.ensure(Miri { compiler, target });
         let mingw_installer = builder.ensure(Mingw { host: target });
         let analysis_installer = builder.ensure(Analysis { compiler, target });
-        let rustc_codegen_cranelift_installer =
-            builder.ensure(CodegenBackend { compiler, target, backend: INTERNER.intern_str("cranelift") });
+        let rustc_codegen_cranelift_installer = builder.ensure(CodegenBackend {
+            compiler,
+            target,
+            backend: INTERNER.intern_str("cranelift"),
+        });
 
         let docs_installer = builder.ensure(Docs { host: target });
         let std_installer = builder.ensure(Std { compiler, target });