Skip to content
Snippets Groups Projects
Commit 4311d5ea authored by David Parks's avatar David Parks
Browse files

SH-1371 tcmalloc comes with the viewer now, don't look for it in /usr/lib

parent 5e4c0cd8
No related branches found
No related tags found
No related merge requests found
......@@ -92,23 +92,23 @@ cd "${RUN_PATH}"
## subprocesses that care.
export SAVED_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
if [ -n "$LL_TCMALLOC" ]; then
tcmalloc_libs='/usr/lib/libtcmalloc.so.0 /usr/lib/libstacktrace.so.0 /lib/libpthread.so.0'
all=1
for f in $tcmalloc_libs; do
if [ ! -f $f ]; then
all=0
fi
done
if [ $all != 1 ]; then
echo 'Cannot use tcmalloc libraries: components missing' 1>&2
else
export LD_PRELOAD=$(echo $tcmalloc_libs | tr ' ' :)
if [ -z "$HEAPCHECK" -a -z "$HEAPPROFILE" ]; then
export HEAPCHECK=${HEAPCHECK:-normal}
fi
fi
fi
# if [ -n "$LL_TCMALLOC" ]; then
# tcmalloc_libs='/usr/lib/libtcmalloc.so.0 /usr/lib/libstacktrace.so.0 /lib/libpthread.so.0'
# all=1
# for f in $tcmalloc_libs; do
# if [ ! -f $f ]; then
# all=0
# fi
# done
# if [ $all != 1 ]; then
# echo 'Cannot use tcmalloc libraries: components missing' 1>&2
# else
# export LD_PRELOAD=$(echo $tcmalloc_libs | tr ' ' :)
# if [ -z "$HEAPCHECK" -a -z "$HEAPPROFILE" ]; then
# export HEAPCHECK=${HEAPCHECK:-normal}
# fi
# fi
#fi
export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"${LD_LIBRARY_PATH}"'
export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-secondlife-bin'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment