From 69b42d5ecf0bdfb2a693fabf4b348736eeafe370 Mon Sep 17 00:00:00 2001
From: Pauli <suokkos@gmail.com>
Date: Tue, 12 Jun 2018 20:44:21 +0300
Subject: [PATCH] Support DF command line arguments with gdb

---
 package/linux/dfhack | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/package/linux/dfhack b/package/linux/dfhack
index 07fe62a06..17a3eea4a 100755
--- a/package/linux/dfhack
+++ b/package/linux/dfhack
@@ -68,11 +68,8 @@ setarch_arch=$(cat hack/dfhack_setarch.txt || printf i386)
 case "$1" in
   -g | --gdb)
     shift
-    echo "set environment LD_LIBRARY_PATH $LD_LIBRARY_PATH" > gdbcmd.tmp
-    echo "set environment LD_PRELOAD $PRELOAD_LIB" >> gdbcmd.tmp
-    echo "set environment MALLOC_PERTURB_ 45" >> gdbcmd.tmp
-    echo "set startup-with-shell off" >> gdbcmd.tmp
-    gdb $DF_GDB_OPTS -x gdbcmd.tmp ./libs/Dwarf_Fortress "$@"
+    echo "set exec-wrapper env LD_LIBRARY_PATH='$LD_LIBRARY_PATH' LD_PRELOAD='$PRELOAD_LIB' MALLOC_PERTURB_=45" > gdbcmd.tmp
+    gdb $DF_GDB_OPTS -x gdbcmd.tmp --args ./libs/Dwarf_Fortress "$@"
     rm gdbcmd.tmp
     ret=$?
     ;;