diff options
author | Richard Levitte <levitte@openssl.org> | 2019-04-23 09:29:45 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-04-23 12:44:38 +0200 |
commit | 007213795a0e15901cbdc4558ae2a8c21d3ad9bb (patch) | |
tree | 19272953c52a90b187182dcdc1b39a14be587493 | |
parent | b8fdfd93f81fab35b8802d39ea2f421eabf4c605 (diff) |
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)
(cherry picked from commit 4650d10ff6ad1048785a009349c8b5d6e922fc7a)
-rwxr-xr-x | Configure | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -860,9 +860,6 @@ while (@argvcopy) elsif (/^-static$/) { push @{$useradd{LDFLAGS}}, $_; - $disabled{"pic"} = "forced"; - $disabled{"shared"} = "forced"; - $disabled{"threads"} = "forced"; } elsif (/^-D(.*)$/) { @@ -1560,6 +1557,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' |