From a810f6fb0cd7c8f288f0cf95a29e5dcb2741312d Mon Sep 17 00:00:00 2001 From: Nicky Date: Fri, 1 Mar 2019 12:24:16 +0100 Subject: [PATCH] FIRE-23662; Use absolute path for jemalloc to make .so detection work under all circumstances. Contributed by Lance Corrimal. --- indra/newview/linux_tools/wrapper.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh index 867957fdc9..2fa1c60d12 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh @@ -141,10 +141,11 @@ fi fi -if test -f lib/libjemalloc.so +FSJEMALLOC="$(pwd)/lib/libjemalloc.so" +if [ -f ${FSJEMALLOC} ] then echo "Using jemalloc" - export LD_PRELOAD="${LD_PRELOAD}:lib/libjemalloc.so" + export LD_PRELOAD="${LD_PRELOAD}:${FSJEMALLOC}" fi export FS_CEF_PRELOAD="libcef.so"