diff options
| author | jkim <jkim@FreeBSD.org> | 2016-05-03 18:50:10 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2016-05-03 18:50:10 +0000 |
| commit | 00a878d06ed0d3bdfbf6339ef29f6cc94fd47ced (patch) | |
| tree | 64905eaaef6c163463b7acbaca1a9724913735f5 /crypto/openssl/util/shlib_wrap.sh | |
| parent | c052df1347dcbd00de507acf0cfa03733e795db5 (diff) | |
| parent | acb827e3083196de4c00b67ac9ae3bf860ffd4a9 (diff) | |
| download | FreeBSD-src-00a878d06ed0d3bdfbf6339ef29f6cc94fd47ced.zip FreeBSD-src-00a878d06ed0d3bdfbf6339ef29f6cc94fd47ced.tar.gz | |
Merge OpenSSL 1.0.2h.
Relnotes: yes
Diffstat (limited to 'crypto/openssl/util/shlib_wrap.sh')
| -rwxr-xr-x | crypto/openssl/util/shlib_wrap.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/crypto/openssl/util/shlib_wrap.sh b/crypto/openssl/util/shlib_wrap.sh index 8775cb5..de111e9 100755 --- a/crypto/openssl/util/shlib_wrap.sh +++ b/crypto/openssl/util/shlib_wrap.sh @@ -27,6 +27,15 @@ SunOS|IRIX*) LD_PRELOAD_64="$LIBCRYPTOSO $LIBSSLSO"; export LD_PRELOAD_64 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 # over LD_LIBRARY_PATH and as result application ends up linking |
