bootstrap: Locate llvm-dwp based on llvm-config bindir

rust-lang · Feb 10, 2021 · 9e98dfe · 9e98dfe
1 parent 0a6c6cc
commit 9e98dfe
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
@@ -1057,8 +1057,11 @@ impl Step for Assemble {
             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 });
-            let llvm_bin_dir = llvm_config_bin.parent().unwrap();
-            builder.copy(&llvm_bin_dir.join(&src_exe), &libdir_bin.join(&dst_exe));
+            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));
+            }
         }
 
         // Ensure that `libLLVM.so` ends up in the newly build compiler directory,