From: Richard Levitte <levitte@openssl.org>
Date: Fri, 17 Jan 2020 11:47:44 +0000 (+0100)
Subject: Configure: Better detection of '-static' in @{$config{LDFLAGS}}
X-Git-Tag: openssl-3.0.0-alpha1~615
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cf0843c09101fa7a1718c4423543358b7fe1876a;p=oweals%2Fopenssl.git

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@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/10878)
---

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');
 }