Commit 7b7f21cd authored by Richard Levitte's avatar Richard Levitte Committed by Richard Levitte
Browse files

Remove automatic RPATH - adapt shlib_wrap.sh 



Looking for something starting with '-Wl,-rpath,' isn't good enough,
as someone might give something like '-Wl,--enable-new-dtags,-rpath,/PATH'.
Looking for ',-rpath,' should be safe enough.

We could remove the preloading stuff entirely, but just in case the
user has chosen to given RPATH setting arguments at configuration,
we'd better make sure testing will still work.  Fair warning, there
are some configuration options that do not work with preloaded OpenSSL
libraries, such as the sanity checking ones.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(cherry picked from commit 71d8ff1a)
parent 0de5e4f0

util/shlib_wrap.sh.in

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ SunOS|IRIX*) 
	;;

esac



{- output_off() if $config{ex_libs} !~ /(^|\s)-Wl,-rpath,/; ""; -}

{- output_off() if $config{ex_libs} !~ /,-rpath,/; ""; -}

if [ -f "$LIBCRYPTOSO" -a -z "$preload_var" ]; then

	# Following three lines are major excuse for isolating them into

	# this wrapper script. Original reason for setting LD_PRELOAD
@@ -97,7 +97,7 @@ if [ -f "$LIBCRYPTOSO" -a -z "$preload_var" ]; then 
	DYLD_INSERT_LIBRARIES="$LIBCRYPTOSO:$LIBSSLSO"	# MacOS X

	export LD_PRELOAD _RLD_LIST DYLD_INSERT_LIBRARIES

fi

{- output_on() if $config{ex_libs} !~ /(^|\s)-Wl,-rpath,/; ""; -}

{- output_on() if $config{ex_libs} !~ /,-rpath,/; ""; -}



cmd="$1"; [ -x "$cmd" ] || cmd="$cmd${EXE_EXT}"

shift