From d6426e8a25baa3011b9db14aca660b39b9867578 Mon Sep 17 00:00:00 2001
From: ftilde <ftilde@protonmail.com>
Date: Sat, 18 Aug 2018 23:48:26 +0200
Subject: [PATCH] Exec gdb and lldb in rust-* wrappers

This way the process we get by calling rust-{gdb,lldb} is an actual
{gdb,lldb} instance and not (perhaps surprisingly) a script waiting for
the debugger process to finish. Thus, sending a SIGINT to the spawned
process stops execution of the child, for example.
---
 src/etc/rust-gdb  | 2 +-
 src/etc/rust-lldb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb
index 6835d6aa908..743952a5bef 100755
--- a/src/etc/rust-gdb
+++ b/src/etc/rust-gdb
@@ -20,7 +20,7 @@ GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
 # Set the environment variable `RUST_GDB` to overwrite the call to a
 # different/specific command (defaults to `gdb`).
 RUST_GDB="${RUST_GDB:-gdb}"
-PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" ${RUST_GDB} \
+PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" exec ${RUST_GDB} \
   --directory="$GDB_PYTHON_MODULE_DIRECTORY" \
   -iex "add-auto-load-safe-path $GDB_PYTHON_MODULE_DIRECTORY" \
   "$@"
diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb
index 56851595dd5..6a2849b5548 100755
--- a/src/etc/rust-lldb
+++ b/src/etc/rust-lldb
@@ -32,7 +32,7 @@ category_definition="type summary add --no-value --python-function lldb_rust_for
 category_enable="type category enable Rust"
 
 # Call LLDB with the commands added to the argument list
-lldb --one-line-before-file="$script_import" \
+exec lldb --one-line-before-file="$script_import" \
     --one-line-before-file="$category_definition" \
     --one-line-before-file="$category_enable" \
     "$@"
-- 
2.44.0