From: Angus Lees <gus@debian.org>
Date: Thu, 30 May 2019 04:52:37 +0000 (+0100)
Subject: Hardcode LLDB python module directory
X-Git-Tag: archive/raspbian/1.34.2+dfsg1-1+rpi1^2~9
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cf16d4bb12231949991d1b2fd1f22f171a6c0e7f;p=rustc.git

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
---

diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb
index 424302d495..7fd6822cba 100755
--- a/src/etc/rust-lldb
+++ b/src/etc/rust-lldb
@@ -3,30 +3,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"