Auto merge of #62497 - o01eg:fix-62496, r=<try>

bors · bors · commit 661f42a57a32 · 2019-07-09T16:28:07.000Z
Fix double resolving custom libdir Fixes #62496 Related issue is https://bugs.gentoo.org/672816
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
@@ -485,16 +485,19 @@ impl Step for Rustc {
                     let name = entry.file_name();
                     if let Some(s) = name.to_str() {
                         if is_dylib(s) {
-                            builder.install(&entry.path(), &image.join(&libdir_relative), 0o644);
+                            // Don't use custom libdir here because ^lib/ will be resolved again
+                            // with installer
+                            builder.install(&entry.path(), &image.join("lib"), 0o644);
                         }
                     }
                 }
             }
 
             // Copy over the codegen backends
             let backends_src = builder.sysroot_codegen_backends(compiler);
-            let backends_rel = backends_src.strip_prefix(&src).unwrap();
-            let backends_dst = image.join(&backends_rel);
+            let backends_rel = backends_src.strip_prefix(&libdir).unwrap();
+            // Don't use custom libdir here because ^lib/ will be resolved again with installer
+            let backends_dst = image.join("lib").join(&backends_rel);
             t!(fs::create_dir_all(&backends_dst));
             builder.cp_r(&backends_src, &backends_dst);
 

Original file line number	Diff line number	Diff line change
`@@ -485,16 +485,19 @@ impl Step for Rustc {`
`485`	`485`	`let name = entry.file_name();`
`486`	`486`	`if let Some(s) = name.to_str() {`
`487`	`487`	`if is_dylib(s) {`
`488`		`- builder.install(&entry.path(), &image.join(&libdir_relative), 0o644);`
	`488`	`+ // Don't use custom libdir here because ^lib/ will be resolved again`
	`489`	`+ // with installer`
	`490`	`+ builder.install(&entry.path(), &image.join("lib"), 0o644);`
`489`	`491`	`}`
`490`	`492`	`}`
`491`	`493`	`}`
`492`	`494`	`}`
`493`	`495`
`494`	`496`	`// Copy over the codegen backends`
`495`	`497`	`let backends_src = builder.sysroot_codegen_backends(compiler);`
`496`		`- let backends_rel = backends_src.strip_prefix(&src).unwrap();`
`497`		`- let backends_dst = image.join(&backends_rel);`
	`498`	`+ let backends_rel = backends_src.strip_prefix(&libdir).unwrap();`
	`499`	`+ // Don't use custom libdir here because ^lib/ will be resolved again with installer`
	`500`	`+ let backends_dst = image.join("lib").join(&backends_rel);`
`498`	`501`	`t!(fs::create_dir_all(&backends_dst));`
`499`	`502`	`builder.cp_r(&backends_src, &backends_dst);`
`500`	`503`