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)
diff --git a/Configure b/Configure
index b330fd6..ea78461 100755
--- a/Configure
+++ b/Configure
@@ -892,9 +892,6 @@
elsif (/^-static$/)
{
push @{$useradd{LDFLAGS}}, $_;
- $disabled{"pic"} = "forced";
- $disabled{"shared"} = "forced";
- $disabled{"threads"} = "forced";
}
elsif (/^-D(.*)$/)
{
@@ -1583,6 +1580,13 @@
@{$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'
