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

Make the match for previous cflags a bit more strict 



./Configure [target] --strict-warnings -Wno-pedantic-ms-format
would not add '-pedantic' because it matches '-Wno-pedantic-ms-format',
which was added first.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(cherry picked from commit 6703c4ea)
parent fdbe4a3f

Configure

+2 −2
Original line number Diff line number Diff line
@@ -1656,13 +1656,13 @@ if ($strict_warnings) 
	die "ERROR --strict-warnings requires gcc or clang" unless ($ecc =~ /gcc$/ or $ecc =~ /clang$/);

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

		{

		$cflags .= " $wopt" unless ($cflags =~ /$wopt/)

		$cflags .= " $wopt" unless ($cflags =~ /(^|\s)$wopt(\s|$)/)

		}

	if ($ecc eq "clang")

		{

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

			{

			$cflags .= " $wopt" unless ($cflags =~ /$wopt/)

			$cflags .= " $wopt" unless ($cflags =~ /(^|\s)$wopt(\s|$)/)

			}

		}

	}