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

Have rust-lldb look for the rust-enabled lldb

Browse source 
We're shipping a rust-enabled lldb, but the "lldb" executable is not
installed into the "bin" directory by rustup.  See the discussion in
https://github.com/rust-lang-nursery/rustup.rs/pull/1492 for
background on this decision.  There, we agreed to have rust-lldb
prefer the rust-enabled lldb if it is installed.

This patch changes dist.rs to put lldb into rustlib, following what
was done for the other LLVM tools in #53955, and then fixes rust-lldb
to prefer that lldb, if it exists.

See issue #48168
This commit is contained in:
Tom Tromey 2018-09-05 13:05:46 -06:00
parent 7366752a61
commit 8aae6ca44a
2 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/bootstrap/dist.rs
View file

@ -2056,7 +2056,8 @@ impl Step for Lldb {
drop(fs::remove_dir_all(&image));
// Prepare the image directory
let dst = image.join("bin");
let root = image.join("lib/rustlib").join(&*target);
let dst = root.join("bin");
t!(fs::create_dir_all(&dst));
for program in &["lldb", "lldb-argdumper", "lldb-mi", "lldb-server"] {
let exe = bindir.join(exe(program, &target));
@ -2065,7 +2066,7 @@ impl Step for Lldb {
// The libraries.
let libdir = builder.llvm_out(target).join("lib");
let dst = image.join("lib");
let dst = root.join("lib");
t!(fs::create_dir_all(&dst));
for entry in t!(fs::read_dir(&libdir)) {
let entry = entry.unwrap();
@ -2093,7 +2094,7 @@ impl Step for Lldb {
let entry = t!(entry);
if let Ok(name) = entry.file_name().into_string() {
if name.starts_with("python") {
let dst = image.join(libdir_name)
let dst = root.join(libdir_name)
.join(entry.file_name());
t!(fs::create_dir_all(&dst));
builder.cp_r(&entry.path(), &dst);