user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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 • committed by Pietro Albini
parent 0a6c6cc510
commit 9e98dfe5cc
No known key found for this signature in database
GPG key ID: 3E06ABE80BAAF19C
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/bootstrap/compile.rs
View file

@ -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,