diff options
Diffstat (limited to 'util')
-rwxr-xr-x | util/shlib_wrap.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/util/shlib_wrap.sh b/util/shlib_wrap.sh index 9b1dd66578..ce463f17e8 100755 --- a/util/shlib_wrap.sh +++ b/util/shlib_wrap.sh @@ -28,9 +28,13 @@ SunOS|IRIX*) preload_var=LD_PRELOAD_64 ;; *ELF\ 32*SPARC*|*ELF\ 32*80386*) - [ -n "$LD_LIBRARY_PATH_32" ] && rld_var=LD_LIBRARY_PATH_32 - LD_PRELOAD_32="$LIBCRYPTOSO $LIBSSLSO"; export LD_PRELOAD_32 - preload_var=LD_PRELOAD_32 + # We only need to change LD_PRELOAD_32 and LD_LIBRARY_PATH_32 + # on a multi-arch system. Otherwise, trust the fallbacks. + if [ -f /lib/64/ld.so.1 ]; then + [ -n "$LD_LIBRARY_PATH_32" ] && rld_var=LD_LIBRARY_PATH_32 + LD_PRELOAD_32="$LIBCRYPTOSO $LIBSSLSO"; export LD_PRELOAD_32 + preload_var=LD_PRELOAD_32 + fi ;; # Why are newly built .so's preloaded anyway? Because run-time # .so lookup path embedded into application takes precedence |