summaryrefslogtreecommitdiff
path: root/user/rust/0015-Move-debugger-scripts-to-usr-share-rust.patch
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2019-10-07 00:01:16 +0000
committerSamuel Holland <samuel@sholland.org>2019-10-14 22:36:45 -0500
commit3febb3d8330926d97e865c3aeaddff95acef8b83 (patch)
tree08b9bb19c509e2093a12b7bd53a2ac51769134f6 /user/rust/0015-Move-debugger-scripts-to-usr-share-rust.patch
parentb5b897e47ab11998c46db7f9ba96410a187c0634 (diff)
downloadpackages-3febb3d8330926d97e865c3aeaddff95acef8b83.tar.gz
packages-3febb3d8330926d97e865c3aeaddff95acef8b83.tar.bz2
packages-3febb3d8330926d97e865c3aeaddff95acef8b83.tar.xz
packages-3febb3d8330926d97e865c3aeaddff95acef8b83.zip
user/rust: Bump to 1.38.0
Signed-off-by: Samuel Holland <samuel@sholland.org>
Diffstat (limited to 'user/rust/0015-Move-debugger-scripts-to-usr-share-rust.patch')
-rw-r--r--user/rust/0015-Move-debugger-scripts-to-usr-share-rust.patch53
1 files changed, 0 insertions, 53 deletions
diff --git a/user/rust/0015-Move-debugger-scripts-to-usr-share-rust.patch b/user/rust/0015-Move-debugger-scripts-to-usr-share-rust.patch
deleted file mode 100644
index ed30dfd15..000000000
--- a/user/rust/0015-Move-debugger-scripts-to-usr-share-rust.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 1d81148c7b7c048cb1c586ece96bd326ae0f72ec Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Mon, 17 Sep 2018 02:09:10 +0000
-Subject: [PATCH 15/16] 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 45bc77ec97d..9e82352ef65 100644
---- a/src/bootstrap/dist.rs
-+++ b/src/bootstrap/dist.rs
-@@ -593,7 +593,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 23ba93da8e5..dc51b16c572 100755
---- a/src/etc/rust-gdb
-+++ b/src/etc/rust-gdb
-@@ -4,7 +4,7 @@ set -e
-
- # 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 0eb99423df5..f069300dafe 100755
---- a/src/etc/rust-lldb
-+++ b/src/etc/rust-lldb
-@@ -26,7 +26,7 @@ display the contents of local variables!"
- 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.21.0
-