[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  0221b080cefa7358c0a0737d089caeec2979f930 (commit)
      from  b93f6c2db94f736b497ff31a793c1e6766eaf209 (commit)


- Log -----------------------------------------------------------------
commit 0221b080cefa7358c0a0737d089caeec2979f930
Author: Tom Cosgrove <tom.cosgrove at arm.com>
Date:   Mon May 17 09:59:57 2021 +0100

    Fix -static builds on master
    
    Pull in Todd Short's fix cfd7225fbb from 1.1.1, which moves the disabling
    of pic, threads and statics to before they are checked.
    
    Signed-off-by: Tom Cosgrove <tom.cosgrove at arm.com>
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15214)

-----------------------------------------------------------------------

Summary of changes:
 Configure | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Configure b/Configure
index a6fb8324a0..92f7526bfa 100755
--- a/Configure
+++ b/Configure
@@ -1380,6 +1380,10 @@ foreach (keys %useradd) {
 # At this point, we can forget everything about %user and %useradd,
 # because it's now all been merged into the corresponding $config entry
 
+if (grep { $_ =~ /(?:^|\s)-static(?:\s|$)/ } @{$config{LDFLAGS}}) {
+    disable('static', 'pic', 'threads');
+}
+
 # Allow overriding the build file name
 $config{build_file} = env('BUILDFILE') || $target{build_file} || "Makefile";
 
@@ -1668,10 +1672,6 @@ if ($strict_warnings)
                 }
         }
 
-if (grep { $_ =~ /(?:^|\s)-static(?:\s|$)/ } @{$config{LDFLAGS}}) {
-    disable('static', 'pic', 'threads');
-}
-
 $config{CFLAGS} = [ map { $_ eq '--ossl-strict-warnings'
                               ? @strict_warnings_collection
                               : ( $_ ) }