From 9b9c4248701226fbd31cfa38ea28eabfa739784b Mon Sep 17 00:00:00 2001 From: Angus Lees Date: Tue, 8 Sep 2020 17:38:19 +0100 Subject: [PATCH] Hardcode LLDB python module directory Forwarded: not-needed Debian package installs python modules into a fixed directory, so just hardcode path in wrapper script. Gbp-Pq: Name d-rust-lldb-paths --- src/etc/rust-lldb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb index 7b9b40e6b4..9fc279393d 100755 --- a/src/etc/rust-lldb +++ b/src/etc/rust-lldb @@ -10,7 +10,7 @@ host=$(rustc -vV | sed -n -e 's/^host: //p') RUSTC_SYSROOT=$(rustc --print sysroot) RUST_LLDB="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb" -lldb=lldb +lldb=lldb-7 if [ -f "$RUST_LLDB" ]; then lldb="$RUST_LLDB" else @@ -31,7 +31,7 @@ EOF fi # Prepare commands that will be loaded before any file on the command line has been loaded -script_import="command script import \"$RUSTC_SYSROOT/lib/rustlib/etc/lldb_rust_formatters.py\"" +script_import="command script import \"$RUSTC_SYSROOT/share/rust-lldb/lldb_rust_formatters.py\"" category_definition="type summary add --no-value --python-function lldb_rust_formatters.print_val -x \".*\" --category Rust" category_enable="type category enable Rust" -- 2.30.2