[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  cf0843c09101fa7a1718c4423543358b7fe1876a (commit)
      from  8baa49aeac0d51504b8bcd0fd5c750c17af6fe62 (commit)


- Log -----------------------------------------------------------------
commit cf0843c09101fa7a1718c4423543358b7fe1876a
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jan 17 12:47:44 2020 +0100

    Configure: Better detection of '-static' in @{$config{LDFLAGS}}
    
    @{$config{LDFLAGS}} isn't necessarily split up in pieces, so we need
    to check for '-static' with a regexp rather than with an exact string
    match.
    
    Fixes #10867
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/10878)

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

Summary of changes:
 Configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configure b/Configure
index 1e86bfa198..696f15ab0f 100755
--- a/Configure
+++ b/Configure
@@ -1513,7 +1513,7 @@ if ($strict_warnings)
                 }
         }
 
-if (grep { $_ eq '-static' } @{$config{LDFLAGS}}) {
+if (grep { $_ =~ /(?:^|\s)-static(?:\s|$)/ } @{$config{LDFLAGS}}) {
     disable('static', 'pic', 'threads');
 }