diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-10-13 00:08:55 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-10-13 02:21:51 +0200 |
| commit | 71d8ff1a8998da20db5ab8d4024c3d155b2f6733 (patch) | |
| tree | 42b93c2cafa78eb5db7d76054fca09831b5a2481 /util | |
| parent | Remove automatic RPATH - add user rpath support (diff) | |
| download | openssl-71d8ff1a8998da20db5ab8d4024c3d155b2f6733.tar.xz openssl-71d8ff1a8998da20db5ab8d4024c3d155b2f6733.zip | |
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: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/shlib_wrap.sh.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/shlib_wrap.sh.in b/util/shlib_wrap.sh.in index eff11417a5..27a1e513c8 100755 --- a/util/shlib_wrap.sh.in +++ b/util/shlib_wrap.sh.in @@ -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 |