Commit 3f76ca6e authored by Andre Sailer's avatar Andre Sailer
Browse files

Merge branch 'valgrind_lib' into 'master'

[SPI-1992]: set VALGRIND_LIB depending where shared objects are

See merge request !951
parents a37ef32f f26d53e9
Pipeline #3084170 passed with stage
in 46 seconds
......@@ -250,7 +250,9 @@ if ( -e $thisdir/bin/R && $?FC ) then
endif
#---then Valgrind
if ( -e $thisdir/bin/valgrind ) then
if ( -e $thisdir/libexec/valgrind/vgpreload_memcheck-amd64-linux.so ) then
setenv VALGRIND_LIB ${thisdir}/libexec/valgrind
else if ( -e $thisdir/lib/valgrind/vgpreload_memcheck-amd64-linux.so ) then
setenv VALGRIND_LIB ${thisdir}/lib/valgrind
endif
......
......@@ -227,7 +227,9 @@ if [ -x $thisdir/bin/R ] && [ -n "$FC" ]; then
fi
#---then Valgrind
if [ -x $thisdir/bin/valgrind ]; then
if [ -x $thisdir/libexec/valgrind/vgpreload_memcheck-amd64-linux.so ]; then
VALGRIND_LIB=$thisdir/libexec/valgrind; export VALGRIND_LIB
elif [ -x $thisdir/lib/valgrind/vgpreload_memcheck-amd64-linux.so ]; then
VALGRIND_LIB=$thisdir/lib/valgrind; export VALGRIND_LIB
fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment