[openssl] master update
Richard Levitte
levitte at openssl.org
Tue May 21 11:50:33 UTC 2019
The branch master has been updated
via 54af7f5502e7f46ef08618ae14fd8005f83b0dc0 (commit)
from c04b66b18d1a90f0c6326858e4b8367be5444582 (commit)
- Log -----------------------------------------------------------------
commit 54af7f5502e7f46ef08618ae14fd8005f83b0dc0
Author: Richard Levitte <levitte at openssl.org>
Date: Tue May 21 13:43:41 2019 +0200
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 at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8965)
-----------------------------------------------------------------------
Summary of changes:
Configurations/shared-info.pl | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Configurations/shared-info.pl b/Configurations/shared-info.pl
index 2e2d28d..f942078 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',
};
More information about the openssl-commits
mailing list