[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  6703c4ea87b30554283deaa5df1f8d68725d3ee4 (commit)
      from  36e79832d33a5e5ec11a21071c4889ff25d47075 (commit)


- Log -----------------------------------------------------------------
commit 6703c4ea87b30554283deaa5df1f8d68725d3ee4
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Nov 9 09:50:56 2015 +0100

    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: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Configure b/Configure
index 7956247..c53c316 100755
--- a/Configure
+++ b/Configure
@@ -1740,13 +1740,13 @@ if ($strict_warnings)
 	die "ERROR --strict-warnings requires gcc or clang" unless ($ecc =~ /gcc(-\d(\.\d)*)?$/ 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|$)/)
 			}
 		}
 	}