53 lines
2.0 KiB
Diff
53 lines
2.0 KiB
Diff
From 9b0c14783127e195d7bd54ca2c0c498a46714964 Mon Sep 17 00:00:00 2001
|
|
From: Samuel Holland <samuel@sholland.org>
|
|
Date: Mon, 17 Sep 2018 02:09:10 +0000
|
|
Subject: [PATCH 10/15] Move debugger scripts to /usr/share/rust
|
|
|
|
---
|
|
src/bootstrap/dist.rs | 2 +-
|
|
src/etc/rust-gdb | 2 +-
|
|
src/etc/rust-lldb | 2 +-
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
|
|
index 8215211e..05a173b4 100644
|
|
--- a/src/bootstrap/dist.rs
|
|
+++ b/src/bootstrap/dist.rs
|
|
@@ -603,7 +603,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 23ba93da..dc51b16c 100755
|
|
--- a/src/etc/rust-gdb
|
|
+++ b/src/etc/rust-gdb
|
|
@@ -12,7 +12,7 @@
|
|
|
|
# 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"
|
|
|
|
# Run GDB with the additional arguments that load the pretty printers
|
|
# Set the environment variable `RUST_GDB` to overwrite the call to a
|
|
diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb
|
|
index 7b9b40e6..e471db36 100755
|
|
--- a/src/etc/rust-lldb
|
|
+++ b/src/etc/rust-lldb
|
|
@@ -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_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.26.2
|