diff options
author | Samuel Holland <samuel@sholland.org> | 2018-10-06 04:22:05 +0000 |
---|---|---|
committer | Samuel Holland <samuel@sholland.org> | 2018-10-09 04:28:15 +0000 |
commit | 2323b0da26e293bb4d5a7a4ad8afed85a599d11d (patch) | |
tree | d67f5276d8d72c2fe2caa2e4e5756c14848d9f91 /user/rust/0025-Move-debugger-scripts-to-usr-share-rust.patch | |
parent | 49cec2be42835f6b4c5ff1bad4710e20db422b87 (diff) | |
download | packages-2323b0da26e293bb4d5a7a4ad8afed85a599d11d.tar.gz packages-2323b0da26e293bb4d5a7a4ad8afed85a599d11d.tar.bz2 packages-2323b0da26e293bb4d5a7a4ad8afed85a599d11d.tar.xz packages-2323b0da26e293bb4d5a7a4ad8afed85a599d11d.zip |
user/rust: Bump to 1.29.1 plus fixes for i586, ppc32
Diffstat (limited to 'user/rust/0025-Move-debugger-scripts-to-usr-share-rust.patch')
-rw-r--r-- | user/rust/0025-Move-debugger-scripts-to-usr-share-rust.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/user/rust/0025-Move-debugger-scripts-to-usr-share-rust.patch b/user/rust/0025-Move-debugger-scripts-to-usr-share-rust.patch deleted file mode 100644 index f1b163f2d..000000000 --- a/user/rust/0025-Move-debugger-scripts-to-usr-share-rust.patch +++ /dev/null @@ -1,53 +0,0 @@ -From e2660b4762083f14a355d283b6383f7cab0d38fd Mon Sep 17 00:00:00 2001 -From: Samuel Holland <samuel@sholland.org> -Date: Mon, 17 Sep 2018 02:09:10 +0000 -Subject: [PATCH 25/28] 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 c6b39a52ae..ca21e87c9d 100644 ---- a/src/bootstrap/dist.rs -+++ b/src/bootstrap/dist.rs -@@ -575,7 +575,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 6835d6aa90..dbdee6af31 100755 ---- a/src/etc/rust-gdb -+++ b/src/etc/rust-gdb -@@ -14,7 +14,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 f70ab65bce..621546bd3f 100755 ---- a/src/etc/rust-lldb -+++ b/src/etc/rust-lldb -@@ -33,7 +33,7 @@ trap "rm -f $TMPFILE; exit" INT TERM EXIT - RUSTC_SYSROOT=`rustc --print sysroot` - - # Write the LLDB script to the tempfile --echo "command script import \"$RUSTC_SYSROOT/lib/rustlib/etc/lldb_rust_formatters.py\"" >> $TMPFILE -+echo "command script import \"$RUSTC_SYSROOT/share/rust/lldb_rust_formatters.py\"" >> $TMPFILE - echo "type summary add --no-value --python-function lldb_rust_formatters.print_val -x \".*\" --category Rust" >> $TMPFILE - echo "type category enable Rust" >> $TMPFILE - --- -2.18.0 - |