From: Richard Levitte <levitte@openssl.org>
Date: Tue, 21 May 2019 11:43:41 +0000 (+0200)
Subject: Configure: for '-z defs', also check $config{cflags}
X-Git-Tag: openssl-3.0.0-alpha1~2057
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=54af7f5502e7f46ef08618ae14fd8005f83b0dc0;p=oweals%2Fopenssl.git

Configure: for '-z defs', also check $config{cflags}

When sanitize options are added as 'enable-msan' or similar, the
-fsanitize C flags is set in $config{cflags} rather than
$config{CFLAGS}, so we need to check both.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8965)
---

diff --git a/Configurations/shared-info.pl b/Configurations/shared-info.pl
index 2e2d28d95e..f9420785f2 100644
--- a/Configurations/shared-info.pl
+++ b/Configurations/shared-info.pl
@@ -33,7 +33,8 @@ my %shared_info;
             %{$shared_info{'gnu-shared'}},
             shared_defflag    => '-Wl,--version-script=',
             dso_ldflags       =>
-                (grep /(?:^|\s)-fsanitize/, @{$config{CFLAGS}})
+                (grep /(?:^|\s)-fsanitize/,
+                 @{$config{CFLAGS}}, @{$config{cflags}})
                 ? ''
                 : '-z defs',
         };