Commit e76f4853 authored by Richard Levitte's avatar Richard Levitte
Browse files

Touch the correct variables for the system; shlib_wrap.sh on Solaris 



If there is cause to think LD_LIBRARY_PATH_32 and LD_PRELOAD_32 are
appropriate variables to touch, do so.  Otherwise, touch the usual
LD_LIBRARY_PATH and LD_PRELOAD.  This covers for older installations
that don't have a mix of 32-bit and 64-bit libs.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(cherry picked from commit a772e9d0)
parent d3b37150

util/shlib_wrap.sh

+7 −3
Original line number Diff line number Diff line
@@ -28,9 +28,13 @@ SunOS|IRIX*) 
		preload_var=LD_PRELOAD_64

		;;

	*ELF\ 32*SPARC*|*ELF\ 32*80386*)

		# 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