From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Thu, 13 Jun 2024 09:16:40 +0000 (+0200)
Subject: run panics if lldb is not installed and no output is produced..
X-Git-Tag: archive/raspbian/1.78.0+dfsg1-2+rpi1^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bb9112e1b3ed2624863f566eb2ec160836c97d93;p=rustc.git

run panics if lldb is not installed and no output is produced..

Forwarded: no

Gbp-Pq: Topic build
Gbp-Pq: Name d-armel-fix-lldb.patch
---

diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
index 49c92df3fc..b7156dd3c8 100644
--- a/src/bootstrap/src/core/build_steps/test.rs
+++ b/src/bootstrap/src/core/build_steps/test.rs
@@ -1826,7 +1826,11 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
             .ok();
         if let Some(ref vers) = lldb_version {
             cmd.arg("--lldb-version").arg(vers);
-            let lldb_python_dir = run(Command::new(lldb_exe).arg("-P")).ok();
+            let lldb_python_dir = Command::new(lldb_exe)
+                .arg("-P")
+                .output()
+                .map(|output| String::from_utf8_lossy(&output.stdout).to_string())
+                .ok();
             if let Some(ref dir) = lldb_python_dir {
                 cmd.arg("--lldb-python-dir").arg(dir);
             }