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 /Configure | |
| 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 'Configure')
| -rwxr-xr-x | Configure | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -823,11 +823,7 @@ while (@argvcopy) { read_config $1; } - elsif (/^-L(.*)$/) - { - push @{$useradd{LDFLAGS}}, $_; - } - elsif (/^-l(.*)$/ or /^-Wl,/) + elsif (/^-l(.*)$/) { push @{$useradd{LDLIBS}}, $_; } @@ -835,6 +831,10 @@ while (@argvcopy) { push @{$useradd{LDLIBS}}, $_, shift(@argvcopy); } + elsif (/^-L(.*)$/ or /^-Wl,/) + { + push @{$useradd{LDFLAGS}}, $_; + } elsif (/^-rpath$/ or /^-R$/) # -rpath is the OSF1 rpath flag # -R is the old Solaris rpath flag @@ -954,7 +954,7 @@ foreach (keys %user) { } } -if (grep { $_ =~ /(^|\s)-Wl,-rpath,/ } ($user{LDLIBS} ? @{$user{LDLIBS}} : ()) +if (grep { /-rpath\b/ } ($user{LDFLAGS} ? @{$user{LDFLAGS}} : ()) && !$disabled{shared} && !($disabled{asan} && $disabled{msan} && $disabled{ubsan})) { die "***** Cannot simultaneously use -rpath, shared libraries, and\n", |