Re #10769. This should fix the ld_preload issue.

mantidproject · Dec 12, 2014 · 7332a15 · 7332a15
1 parent f3e733d
commit 7332a15
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Code/Mantid/Build/CMake/Packaging/launch_mantidplot.sh.in b/Code/Mantid/Build/CMake/Packaging/launch_mantidplot.sh.in
@@ -9,7 +9,10 @@ SCRIPTFILE=$(readlink -f "$0")
 INSTALLDIR=$(echo $SCRIPTFILE | sed -r -e 's|^(.*)/(.*)$|\1|g') #.* is greedy and eats up until the final slash
 
 # Define extra libraries and load paths
-LOCAL_PRELOAD=@EXTRA_LDPRELOAD_LIBS@:${LD_PRELOAD}
+LOCAL_PRELOAD=$(readlink -f @EXTRA_LDPRELOAD_LIBS@)
+if [ -n "${LD_PRELOAD}" ]; then
+    LOCAL_PRELOAD=${LOCAL_PRELOAD}:${LD_PRELOAD}
+fi
 LOCAL_LDPATH=@EXTRA_LDPATH@:${LD_LIBRARY_PATH}
 if [ -z "${TCMALLOC_RELEASE_RATE}" ]; then
     TCM_RELEASE=10000