Don't override LD_PRELOAD, just prepend to it.
authorVolker Krause <vkrause@kde.org>
Sat, 17 Jan 2015 15:51:06 +0000 (16:51 +0100)
committerVolker Krause <vkrause@kde.org>
Sat, 17 Jan 2015 15:51:06 +0000 (16:51 +0100)
This enables usage on targets that use LD_PRELOAD themselves already.

heaptrack.sh.cmake

index 97035ed..d72c354 100755 (executable)
@@ -148,7 +148,7 @@ echo "starting application, this might take some time..."
 echo "output will be written to \"$output\""
 
 if [ -z "$debug" ] && [ -z "$pid" ]; then
-  LD_PRELOAD=$LIBHEAPTRACK_PRELOAD DUMP_HEAPTRACK_OUTPUT="$pipe" "$client" "$@"
+  LD_PRELOAD=$LIBHEAPTRACK_PRELOAD${LD_PRELOAD:+:$LD_PRELOAD} DUMP_HEAPTRACK_OUTPUT="$pipe" "$client" "$@"
 else
   if [ -z "$pid" ]; then
     gdb --eval-command="set environment LD_PRELOAD=$LIBHEAPTRACK_PRELOAD" \