Commit 4650d10f authored by Richard Levitte's avatar Richard Levitte
Browse files

Configure: recognise -static even if given through variables 



Fixes #8787

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8812)
parent c1a09254

Configure

+7 −3
Original line number Diff line number Diff line
@@ -892,9 +892,6 @@ while (@argvcopy) 
                elsif (/^-static$/)

                        {

                        push @{$useradd{LDFLAGS}}, $_;

                        $disabled{"pic"} = "forced";

                        $disabled{"shared"} = "forced";

                        $disabled{"threads"} = "forced";

                        }

                elsif (/^-D(.*)$/)

                        {
@@ -1583,6 +1580,13 @@ if ($strict_warnings) 
                @{$clang_devteam_warn{CXXFLAGS}}

                        if (defined($predefined_CXX{__clang__}));

        }



if (grep { $_ eq '-static' } @{$config{LDFLAGS}}) {

    $disabled{"pic"} = "forced";

    $disabled{"shared"} = "forced";

    $disabled{"threads"} = "forced";

}



foreach my $idx (qw(CFLAGS CXXFLAGS))

        {

        $config{$idx} = [ map { $_ eq '--ossl-strict-warnings'