summaryrefslogtreecommitdiff
path: root/Configure
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2020-01-17 12:47:44 +0100
committerRichard Levitte <levitte@openssl.org>2020-01-23 18:01:50 +0100
commitcf0843c09101fa7a1718c4423543358b7fe1876a (patch)
tree91e129d199d7b3d6819a15d280e3db9b9a618cc9 /Configure
parent8baa49aeac0d51504b8bcd0fd5c750c17af6fe62 (diff)
downloadopenssl-new-cf0843c09101fa7a1718c4423543358b7fe1876a.tar.gz
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)
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure2
1 files changed, 1 insertions, 1 deletions
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');
}