OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David Tolnay 2021-02-09 19:04:29 -08:00
parent 87bacf22ec
commit d3fea13ae0
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bootstrap/compile.rs
View File

@ -1075,8 +1075,11 @@ impl Step for Assemble {
let src_exe = exe("llvm-dwp", target_compiler.host); let src_exe = exe("llvm-dwp", target_compiler.host);
let dst_exe = exe("rust-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_config_bin = builder.ensure(native::Llvm { target: target_compiler.host });
let llvm_bin_dir = llvm_config_bin.parent().unwrap(); if !builder.config.dry_run {
builder.copy(&llvm_bin_dir.join(&src_exe), &libdir_bin.join(&dst_exe)); 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, // Ensure that `libLLVM.so` ends up in the newly build compiler directory,