Commit cd7dc67c authored by Richard Levitte's avatar Richard Levitte
Browse files

Configure: make --strict-warnings a regular user provided compiler option 



This makes `--strict-warnings` into a compiler pseudo-option, i.e. it
gets treated the same way as any other compiler option given on the
configuration command line, but is retroactively replaced by actual
compiler warning options, depending on what compiler is used.

This makes it easier to see in what order options are given to the
compiler from the configuration command line, i.e. this:

    ./config -Wall --strict-warnings

would give the compiler flags in the same order as they're given,
i.e.:

    -Wall -Werror -Wno-whatever ...

instead of what we got previously:

    -Werror -Wno-whatever ... -Wall

(cherry picked from commit fcee5394)

Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8359)
parent dbb13403

Configure

+16 −20
Original line number Diff line number Diff line
@@ -747,6 +747,10 @@ while (@argvcopy) 
		}

	elsif (/^--strict-warnings$/)

		{

		# Pretend that our strict flags is a C flag, and replace it

		# with the proper flags later on

		push @{$useradd{CFLAGS}}, '--ossl-strict-warnings';

		push @{$useradd{CXXFLAGS}}, '--ossl-strict-warnings';

		$strict_warnings=1;

		}

	elsif (/^--debug$/)
@@ -1510,6 +1514,7 @@ if (defined($config{api})) { 
    push @{$config{defines}}, $apiflag;

}



my @strict_warnings_collection=();

if ($strict_warnings)

	{

	my $wopt;
@@ -1517,25 +1522,16 @@ if ($strict_warnings) 


	die "ERROR --strict-warnings requires gcc[>=4] or gcc-alike"

            unless $gccver >= 4;

	foreach $wopt (split /\s+/, $gcc_devteam_warn)

		{

		push @{$config{cflags}}, $wopt

			unless grep { $_ eq $wopt } @{$config{cflags}};

		push @{$config{cxxflags}}, $wopt

			if ($config{CXX}

			    && !grep { $_ eq $wopt } @{$config{cxxflags}});

	push @strict_warnings_collection, (split /\s+/, $gcc_devteam_warn);

	push @strict_warnings_collection, (split /\s+/, $clang_devteam_warn)

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

	}

	if (defined($predefined{__clang__}))

		{

		foreach $wopt (split /\s+/, $clang_devteam_warn)

foreach (qw(CFLAGS CXXFLAGS))

        {

			push @{$config{cflags}}, $wopt

				unless grep { $_ eq $wopt } @{$config{cflags}};

			push @{$config{cxxflags}}, $wopt

				if ($config{CXX}

				    && !grep { $_ eq $wopt } @{$config{cxxflags}});

			}

		}

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

                                  ? @strict_warnings_collection

                                  : ( $_ ) }

                            @{$useradd{$_}} ];

        }



unless ($disabled{"crypto-mdebug-backtrace"})