From: Richard Levitte <levitte@openssl.org>
Date: Sun, 6 Mar 2016 21:36:57 +0000 (+0100)
Subject: Recognise 32-bit Solaris in util/shlib_wrap.sh
X-Git-Tag: OpenSSL_1_0_2h~35
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d3b3715072f1d589ee88a68cc5c07e93a31c0f09;p=oweals%2Fopenssl.git

Recognise 32-bit Solaris in util/shlib_wrap.sh

Submitted by Erik Forsberg <erik@efca.com>

Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit 86e75432835ec3ef7700a7103f9847e3c3d4350d)
---

diff --git a/util/shlib_wrap.sh b/util/shlib_wrap.sh
index 8775cb5411..fb2915d21d 100755
--- a/util/shlib_wrap.sh
+++ b/util/shlib_wrap.sh
@@ -27,6 +27,11 @@ SunOS|IRIX*)
 		LD_PRELOAD_64="$LIBCRYPTOSO $LIBSSLSO"; export LD_PRELOAD_64
 		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
+		;;
 	# Why are newly built .so's preloaded anyway? Because run-time
 	# .so lookup path embedded into application takes precedence
 	# over LD_LIBRARY_PATH and as result application ends up linking