From: Richard Levitte <levitte@openssl.org>
Date: Tue, 23 Apr 2019 07:29:45 +0000 (+0200)
Subject: Configure: recognise -static even if given through variables
X-Git-Tag: OpenSSL_1_1_1c~36
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=007213795a0e15901cbdc4558ae2a8c21d3ad9bb;p=oweals%2Fopenssl.git

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)
---

diff --git a/Configure b/Configure
index cba080a99b..84e3459fdf 100755
--- a/Configure
+++ b/Configure
@@ -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'