diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-05-21 13:43:41 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-05-21 13:50:27 +0200 |
| commit | 54af7f5502e7f46ef08618ae14fd8005f83b0dc0 (patch) | |
| tree | a0e38223b0b6055ce4c48cbaee22be6b444564d6 /Configurations | |
| parent | c04b66b18d1a90f0c6326858e4b8367be5444582 (diff) | |
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)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/shared-info.pl | 3 |
1 files changed, 2 insertions, 1 deletions
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', }; |