MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "we no longer need to set LD_LIBRARY_PATH" 

This reverts commit 96eb6a6de3.
develop
Myk Taylor 2023-08-19 10:23:13 -07:00
parent a06ba69446
commit 8725fd26f6
No known key found for this signature in database
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/linux/dfhack
Unescape Escape View File

@ -36,6 +36,8 @@ fi
old_tty_settings=$(stty -g) old_tty_settings=$(stty -g)
# Now run # Now run
export LD_LIBRARY_PATH="./hack:$LD_LIBRARY_PATH"
LIB="./hack/libdfhack.so" LIB="./hack/libdfhack.so"
LIBSAN="" LIBSAN=""
if which objdump > /dev/null; then if which objdump > /dev/null; then
@ -58,7 +60,7 @@ fi
case "$1" in case "$1" in
-g | --gdb) -g | --gdb)
shift shift
echo "set exec-wrapper env LD_PRELOAD='$PRELOAD_LIB' MALLOC_PERTURB_=45" > gdbcmd.tmp 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 ./dwarfort "$@" gdb $DF_GDB_OPTS -x gdbcmd.tmp --args ./dwarfort "$@"
rm gdbcmd.tmp rm gdbcmd.tmp
ret=$? ret=$?
@ -71,7 +73,8 @@ case "$1" in
echo "If your world gen name has spaces you need to remove spaces from the name in data/init/world_gen.txt" echo "If your world gen name has spaces you need to remove spaces from the name in data/init/world_gen.txt"
echo "****" echo "****"
fi fi
echo "set environment LD_PRELOAD $PRELOAD_LIB" > 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 environment MALLOC_PERTURB_ 45" >> gdbcmd.tmp
echo "set startup-with-shell off" >> gdbcmd.tmp echo "set startup-with-shell off" >> gdbcmd.tmp
echo "target extended-remote localhost:12345" >> gdbcmd.tmp echo "target extended-remote localhost:12345" >> gdbcmd.tmp