diff options
| author | Andy Polyakov <appro@openssl.org> | 2018-06-18 19:08:50 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2018-06-22 11:17:57 +0200 |
| commit | 07e4dc341fa73e8521b7964a1eebdd811c96a160 (patch) | |
| tree | 891dc747ae524884f3e39b93bf3b228cc73ce1e2 /util | |
| parent | 8b2f413e8f2f85e5bcc229e3b63c7f32c7c3c1fd (diff) | |
Configure,util/shlib_wrap.sh: harmonize -Wl and -rpath handling.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6515)
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 b9e3ddf874..9199d12fc7 100755 --- a/util/shlib_wrap.sh.in +++ b/util/shlib_wrap.sh.in @@ -101,7 +101,7 @@ SunOS|IRIX*) ;; esac -{- output_off() if $config{ex_libs} !~ /,-rpath,/; ""; -} +{- output_off() unless grep (/-rpath\b/, @{$config{LDFLAGS}}); ""; -} 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 @@ -117,7 +117,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} !~ /,-rpath,/; ""; -} +{- output_on() unless grep (/-rpath\b/, @{$config{LDFLAGS}}); ""; -} cmd="$1"; [ -x "$cmd" ] || cmd="$cmd${EXE_EXT}" shift |