summaryrefslogtreecommitdiffstats
path: root/debian/patches/d-armel-fix-lldb.patch
blob: 21072dbb162e1c9c74e65d19347544f0b5780901 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
run panics if lldb is not installed and no output is produced..

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index c0fa8c9acb..2b5559efc7 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -1524,7 +1524,11 @@
             .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);
             }