diff options
| author | Richard Levitte <levitte@openssl.org> | 2015-11-09 09:50:56 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2015-11-09 09:50:56 +0100 |
| commit | 6703c4ea87b30554283deaa5df1f8d68725d3ee4 (patch) | |
| tree | 6ea5ecf65f8c310fce4754746f66ed881edea151 | |
| parent | 36e79832d33a5e5ec11a21071c4889ff25d47075 (diff) | |
| download | openssl-6703c4ea87b30554283deaa5df1f8d68725d3ee4.zip openssl-6703c4ea87b30554283deaa5df1f8d68725d3ee4.tar.gz openssl-6703c4ea87b30554283deaa5df1f8d68725d3ee4.tar.bz2 | |
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@openssl.org>
| -rwxr-xr-x | Configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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|$)/) } } } |