From 762d3cd3f87b7fdbb885e1bcd4d1314437dd9377 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Mon, 17 Sep 2018 02:09:10 +0000
Subject: [PATCH 11/12] Move debugger scripts to /usr/share/rust

---
 src/bootstrap/dist.rs | 2 +-
 src/etc/rust-gdb      | 2 +-
 src/etc/rust-gdbgui   | 2 +-
 src/etc/rust-lldb     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 76aad16c1fc26..db53459e8cae4 100644
--- a/src/bootstrap/src/core/build_steps/dist.rs
+++ b/src/bootstrap/src/core/build_steps/dist.rs
@@ -521,7 +521,7 @@ impl Step for DebuggerScripts {
     fn run(self, builder: &Builder<'_>) {
         let host = self.host;
         let sysroot = self.sysroot;
-        let dst = sysroot.join("lib/rustlib/etc");
+        let dst = sysroot.join("share/rust");
         t!(fs::create_dir_all(&dst));
         let cp_debugger_script = |file: &str| {
             builder.install(&builder.src.join("src/etc/").join(file), &dst, 0o644);
diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb
index 9abed30ea6f73..4c7f953edfa46 100755
--- a/src/etc/rust-gdb
+++ b/src/etc/rust-gdb
@@ -12,7 +12,7 @@ fi
 
 # Find out where the pretty printer Python module is
 RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
-GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
+GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/share/rust"
 # Get the commit hash for path remapping
 RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \([a-zA-Z0-9_]*\)/\1/p')"
 
diff --git a/src/etc/rust-gdbgui b/src/etc/rust-gdbgui
index 913269316bd4c..f444fbc4b104e 100755
--- a/src/etc/rust-gdbgui
+++ b/src/etc/rust-gdbgui
@@ -41,7 +41,7 @@ fi
 
 # Find out where the pretty printer Python module is
 RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
-GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
+GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/share/rust"
 # Get the commit hash for path remapping
 RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \([a-zA-Z0-9_]*\)/\1/p')"
 
diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb
index bce72f1bad698..8abb012452787 100755
--- a/src/etc/rust-lldb
+++ b/src/etc/rust-lldb
@@ -30,8 +30,8 @@ EOF
     fi
 fi
 
-script_import="command script import \"$RUSTC_SYSROOT/lib/rustlib/etc/lldb_lookup.py\""
-commands_file="$RUSTC_SYSROOT/lib/rustlib/etc/lldb_commands"
+script_import="command script import \"$RUSTC_SYSROOT/share/rust/lldb_lookup.py\""
+commands_file="$RUSTC_SYSROOT/share/rust/lldb_commands"
 
 # Call LLDB with the commands added to the argument list
 exec "$lldb" --one-line-before-file "$script_import" --source-before-file "$commands_file" "$@"