diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:26:01 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:26:01 +0000 |
commit | c29d7c1ba10d6debd11f9d8aad5d069a6491e60e (patch) | |
tree | a2ad46eb513b315f0efd8170af5eb08870165757 /debian/patches/d-armel-fix-lldb.patch | |
parent | Merging upstream version 1.76.0+dfsg1. (diff) | |
download | rustc-c29d7c1ba10d6debd11f9d8aad5d069a6491e60e.tar.xz rustc-c29d7c1ba10d6debd11f9d8aad5d069a6491e60e.zip |
Adding debian version 1.76.0+dfsg1-1.debian/1.76.0+dfsg1-1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/d-armel-fix-lldb.patch')
-rw-r--r-- | debian/patches/d-armel-fix-lldb.patch | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/debian/patches/d-armel-fix-lldb.patch b/debian/patches/d-armel-fix-lldb.patch deleted file mode 100644 index 36065ace9..000000000 --- a/debian/patches/d-armel-fix-lldb.patch +++ /dev/null @@ -1,19 +0,0 @@ -run panics if lldb is not installed and no output is produced.. - -Index: rust/src/bootstrap/src/core/build_steps/test.rs -=================================================================== ---- rust.orig/src/bootstrap/src/core/build_steps/test.rs -+++ rust/src/bootstrap/src/core/build_steps/test.rs -@@ -1779,7 +1779,11 @@ NOTE: if you're sure you want to do this - .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); - } |