Commit 54af7f55 authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8965)
parent c04b66b1

Configurations/shared-info.pl

+2 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,8 @@ my %shared_info; 
            %{$shared_info{'gnu-shared'}},

            %{$shared_info{'gnu-shared'}},

            shared_defflag    => '-Wl,--version-script=',

            shared_defflag    => '-Wl,--version-script=',

            dso_ldflags       =>

            dso_ldflags       =>

                (grep /(?:^|\s)-fsanitize/, @{$config{CFLAGS}})

                (grep /(?:^|\s)-fsanitize/,

                 @{$config{CFLAGS}}, @{$config{cflags}})

                ? ''

                ? ''

                : '-z defs',

                : '-z defs',

        };

        };