Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/bootstrap/src/core/debuggers/lldb.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,16 @@ pub(crate) fn discover_lldb(builder: &Builder<'_>) -> Option<Lldb> {
// explicit opt-in or configuration.
let lldb_exe = builder.config.lldb.clone().unwrap_or_else(|| PathBuf::from("lldb"));

let lldb_version = command(&lldb_exe)
.allow_failure()
.arg("--version")
.run_capture(builder)
.stdout_if_ok()
.filter(|v| !v.trim().is_empty())?;
let mut cmd = command(&lldb_exe);
cmd.arg("--version");

// If a path to a LLDB binary was provided, it has to exist and return some version, to avoid
// silent failures.
let explicitly_set_lldb = builder.config.lldb.is_some();
if !explicitly_set_lldb {
cmd = cmd.allow_failure();
}
let lldb_version = cmd.run_capture(builder).stdout_if_ok().filter(|v| !v.trim().is_empty())?;

Some(Lldb { lldb_exe, lldb_version })
}
Loading