From: Rust Maintainers <pkg-rust-maintainers@lists.alioth.debian.org>
Date: Mon, 1 Jan 2018 13:27:19 +0000 (+0000)
Subject: d-rust-lldb-paths
X-Git-Tag: archive/raspbian/1.22.1+dfsg1-2+rpi1^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=53bcdbf7d98f21916b1d1bb8e96b3607681ede04;p=rustc.git

d-rust-lldb-paths


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

diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb
index f70ab65bce..69c93bb5d3 100755
--- a/src/etc/rust-lldb
+++ b/src/etc/rust-lldb
@@ -12,7 +12,7 @@
 # Exit if anything fails
 set -e
 
-LLDB_VERSION=`lldb --version 2>/dev/null | head -1 | cut -d. -f1`
+LLDB_VERSION=`lldb-4.0 --version 2>/dev/null | head -1 | cut -d. -f1`
 
 if [ "$LLDB_VERSION" = "lldb-350" ]
 then
@@ -29,13 +29,10 @@ TMPFILE=`mktemp /tmp/rust-lldb-commands.XXXXXX`
 # Make sure to delete the tempfile no matter what
 trap "rm -f $TMPFILE; exit" INT TERM EXIT
 
-# Find out where to look for the pretty printer Python module
-RUSTC_SYSROOT=`rustc --print sysroot`
-
 # Write the LLDB script to the tempfile
-echo "command script import \"$RUSTC_SYSROOT/lib/rustlib/etc/lldb_rust_formatters.py\"" >> $TMPFILE
+echo "command script import \"/usr/share/rust-lldb/lldb_rust_formatters.py\"" >> $TMPFILE
 echo "type summary add --no-value --python-function lldb_rust_formatters.print_val -x \".*\" --category Rust" >> $TMPFILE
 echo "type category enable Rust" >> $TMPFILE
 
 # Call LLDB with the script added to the argument list
-lldb --source-before-file="$TMPFILE" "$@"
+lldb-4.0 --source-before-file="$TMPFILE" "$@"