diff options
Diffstat (limited to 'dev-lang/rust/files/0014-Move-debugger-scripts-to-usr-share-rust.patch')
-rw-r--r-- | dev-lang/rust/files/0014-Move-debugger-scripts-to-usr-share-rust.patch | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/dev-lang/rust/files/0014-Move-debugger-scripts-to-usr-share-rust.patch b/dev-lang/rust/files/0014-Move-debugger-scripts-to-usr-share-rust.patch deleted file mode 100644 index ca1a1b49..00000000 --- a/dev-lang/rust/files/0014-Move-debugger-scripts-to-usr-share-rust.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 22b25a4088a3d09bb569b23dc282edb77df11ab4 Mon Sep 17 00:00:00 2001 -From: Samuel Holland <samuel@sholland.org> -Date: Mon, 17 Sep 2018 02:09:10 +0000 -Subject: [PATCH 14/15] 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 d021feafbe4..f0f5cb8169a 100644 ---- a/src/bootstrap/dist.rs -+++ b/src/bootstrap/dist.rs -@@ -614,7 +614,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 b950cea79ed..559bfe3f1f9 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" - - # 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-gdbgui b/src/etc/rust-gdbgui -index 9744913b686..8722acdcc52 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" - - # Set the environment variable `RUST_GDB` to overwrite the call to a - # different/specific command (defaults to `gdb`). -diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb -index bce72f1bad6..8abb0124527 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" "$@" --- -2.26.2 - |