From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Sun, 10 Sep 2023 17:22:53 +0000 (+0100)
Subject: d-armel-fix-lldb
X-Git-Tag: archive/raspbian/1.68.2+dfsg1-1+rpi1^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f931b4ac12fcc3d7b04c9a5f50341213dfc252f4;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/test.rs b/src/bootstrap/test.rs
index 1a385f59c6..90ffc90e26 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -1553,7 +1553,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);
             }