d-rust-lldb-paths

Gbp-Pq: Name d-rust-lldb-paths

diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb
index 6ed8210349e1727210e95b6f066ef48ae08778b6..d851dda74d6adba55c4e4bffb1f9f4943cfb2fbf 100755 (executable)
--- a/src/etc/rust-lldb
+++ b/src/etc/rust-lldb
@@ -12,30 +12,10 @@
 # Exit if anything fails
 set -e
 
-# Find out where to look for the pretty printer Python module
-RUSTC_SYSROOT=`rustc --print sysroot`
-
-# Find the host triple so we can find lldb in rustlib.
-host=`rustc -vV | sed -n -e 's/^host: //p'`
-
-lldb=lldb
-if [ -f "$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb" ]; then
-    lldb="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb"
-else
-    LLDB_VERSION=`"$lldb" --version 2>/dev/null | head -1 | cut -d. -f1`
-
-    if [ "$LLDB_VERSION" = "lldb-350" ]
-    then
-        echo "***"
-       echo \
-"WARNING: This version of LLDB has known issues with Rust and cannot \
-display the contents of local variables!"
-        echo "***"
-    fi
-fi
+lldb=lldb-7
 
 # 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 \"/usr/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"