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:43:35 +0200 |
| commit | 4650d10ff6ad1048785a009349c8b5d6e922fc7a (patch) | |
| tree | a1071a019bef8e7e05b3dcac20bd8774bc3f3d05 /Configure | |
| parent | Configure: merge all of %user and %useradd into %config earlier (diff) | |
| download | openssl-4650d10ff6ad1048785a009349c8b5d6e922fc7a.tar.xz openssl-4650d10ff6ad1048785a009349c8b5d6e922fc7a.zip | |
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)
Diffstat (limited to 'Configure')
| -rwxr-xr-x | Configure | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -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' |