d-armel-fix-lldb
authorDebian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Wed, 20 Sep 2023 18:18:40 +0000 (19:18 +0100)
committerFabian Grünbichler <debian@fabian.gruenbichler.email>
Wed, 20 Sep 2023 18:18:40 +0000 (19:18 +0100)
run panics if lldb is not installed and no output is produced..

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

src/bootstrap/test.rs

index 2ade9c4e4ea9642f9785fb9183f97bdf1aa10802..84dee288a539c7282b86a04ed26549d21d9d3468 100644 (file)
@@ -1619,7 +1619,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);
             }