From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Mon, 27 May 2024 11:28:20 +0000 (+0200)
Subject: d-armel-fix-lldb
X-Git-Tag: archive/raspbian/1.72.1+dfsg1-1+rpi1^2~12
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=638e7d1810579a28d8d0b6b6f89962640d3fc001;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 c3bf972c34..f9612084f9 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -1631,7 +1631,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);
             }