From 3febb3d8330926d97e865c3aeaddff95acef8b83 Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Mon, 7 Oct 2019 00:01:16 +0000 Subject: user/rust: Bump to 1.38.0 Signed-off-by: Samuel Holland --- ...7-Move-debugger-scripts-to-usr-share-rust.patch | 53 ++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 user/rust/0017-Move-debugger-scripts-to-usr-share-rust.patch (limited to 'user/rust/0017-Move-debugger-scripts-to-usr-share-rust.patch') diff --git a/user/rust/0017-Move-debugger-scripts-to-usr-share-rust.patch b/user/rust/0017-Move-debugger-scripts-to-usr-share-rust.patch new file mode 100644 index 000000000..9ccb19b60 --- /dev/null +++ b/user/rust/0017-Move-debugger-scripts-to-usr-share-rust.patch @@ -0,0 +1,53 @@ +From 7c381527fa142b00f83ec6a9b5f1b7b31fc4d3ee Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Mon, 17 Sep 2018 02:09:10 +0000 +Subject: [PATCH 17/18] 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 552965863d1..fcd644fc52e 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 7b9b40e6b4a..e471db365b7 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.21.0 + -- cgit v1.2.3-60-g2f50