From 7e1cca3044a2ec11b12b1e0004eb59be38950bed Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Wed, 29 May 2019 04:42:59 +0000 Subject: user/rust: Bump to 1.35.0 Signed-off-by: Samuel Holland --- ...3-Move-debugger-scripts-to-usr-share-rust.patch | 53 ---------------------- 1 file changed, 53 deletions(-) delete mode 100644 user/rust/0013-Move-debugger-scripts-to-usr-share-rust.patch (limited to 'user/rust/0013-Move-debugger-scripts-to-usr-share-rust.patch') diff --git a/user/rust/0013-Move-debugger-scripts-to-usr-share-rust.patch b/user/rust/0013-Move-debugger-scripts-to-usr-share-rust.patch deleted file mode 100644 index 8f5b2fbc0..000000000 --- a/user/rust/0013-Move-debugger-scripts-to-usr-share-rust.patch +++ /dev/null @@ -1,53 +0,0 @@ -From b3b713b954619af8768ad21bd73700291e9d7b58 Mon Sep 17 00:00:00 2001 -From: Samuel Holland -Date: Mon, 17 Sep 2018 02:09:10 +0000 -Subject: [PATCH 13/14] 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 2dae3f9135..642e4bfba8 100644 ---- a/src/bootstrap/dist.rs -+++ b/src/bootstrap/dist.rs -@@ -595,7 +595,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 23ba93da8e..dc51b16c57 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 424302d495..460e119210 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 - -- cgit v1.2.3-60-g2f50