From 54af7f5502e7f46ef08618ae14fd8005f83b0dc0 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 21 May 2019 13:43:41 +0200 Subject: [PATCH] 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 (Merged from https://github.com/openssl/openssl/pull/8965) --- 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 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', }; -- 2.25.1