From b3b5d84f680f4217fc5586d5bbe270aab3377483 Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Mon, 17 Sep 2018 02:09:10 +0000 Subject: [PATCH 08/10] Move debugger scripts to /usr/share/rust Signed-off-by: Ismael Luceno --- src/bootstrap/dist.rs | 2 +- src/etc/rust-gdb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 193238eec3f7..f6b537c117dc 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -610,7 +610,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 b950cea79edf..559bfe3f1f92 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 -- 2.30.0