Merge remote-tracking branch 'db48x/make-dfhack-g-work' into develop

develop
lethosor 2018-06-01 00:05:03 -04:00
commit 69d1f7e7fc
1 changed files with 4 additions and 2 deletions

@ -68,8 +68,10 @@ setarch_arch=$(cat hack/dfhack_setarch.txt || printf i386)
case "$1" in
-g | --gdb)
shift
echo "set environment LD_PRELOAD=\"$PRELOAD_LIB\"" > gdbcmd.tmp
echo "set environment MALLOC_PERTURB_=45" >> gdbcmd.tmp
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 "$@"
rm gdbcmd.tmp
ret=$?