From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Wed, 12 Jun 2024 15:33:10 +0000 (+0200)
Subject: d-armel-fix-lldb
X-Git-Tag: archive/raspbian/1.75.0+dfsg1-5+rpi1^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b54a6a8ca425396d01554324a1ba49565b2bc1f3;p=rustc.git

d-armel-fix-lldb

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


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 1ea2d93267..da285750a5 100644
--- a/src/bootstrap/src/core/build_steps/test.rs
+++ b/src/bootstrap/src/core/build_steps/test.rs
@@ -1779,7 +1779,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);
             }