openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

Configure: recognise -static even if given through variables 

Fixes #8787

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8812)
This commit is contained in:
Richard Levitte 2019-04-23 09:29:45 +02:00
parent c1a09254e4
commit 4650d10ff6
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Configure
View File

@ -892,9 +892,6 @@ while (@argvcopy)
elsif (/^-static$/)
{
push @{$useradd{LDFLAGS}}, $_;
$disabled{"pic"} = "forced";
$disabled{"shared"} = "forced";
$disabled{"threads"} = "forced";
}
elsif (/^-D(.*)$/)
{
@ -1583,6 +1580,13 @@ if ($strict_warnings)
@{$clang_devteam_warn{CXXFLAGS}}
if (defined($predefined_CXX{__clang__}));
}
if (grep { $_ eq '-static' } @{$config{LDFLAGS}}) {
$disabled{"pic"} = "forced";
$disabled{"shared"} = "forced";
$disabled{"threads"} = "forced";
}
foreach my $idx (qw(CFLAGS CXXFLAGS))
{
$config{$idx} = [ map { $_ eq '--ossl-strict-warnings'