Accept -Wformat=2 because it implies -Wformat.

[blhc/blhc.git] / bin / blhc

diff --git a/bin/blhc b/bin/blhc
index e03ac2889aa039ed04eaad66720dec1ac73fab18..b77420d1e9af4fea72704cc834cdea74abd5e9a6 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -182,7 +182,7 @@ my @def_cflags = (
     '-O(?:2|3)',
 );
 my @def_cflags_format = (
-    '-Wformat',
+    '-Wformat(?:=2)?', # -Wformat=2 implies -Wformat, accept it too
     '-Werror=format-security', # implies -Wformat-security
 );
 my @def_cflags_fortify = (
@@ -251,6 +251,7 @@ my @flag_refs_all = (
 # stores string values of flag regexps above, see compile_flag_regexp().
 my %flag_renames = (
     '-O(?:2|3)'         => '-O2',
+    '-Wformat(?:=2)?'   => '-Wformat',
     '-Wl,(?:-z,)?relro' => '-Wl,-z,relro',
     '-Wl,(?:-z,)?now'   => '-Wl,-z,now',
 );
@@ -319,6 +320,8 @@ sub error_flags {
     printf '%s (%s)%s %s',
            error_color($message, 'red'), $flags, error_color(':', 'yellow'),
            $line;
+
+    return;
 }
 sub error_non_verbose_build {
     my ($line) = @_;
@@ -327,6 +330,8 @@ sub error_non_verbose_build {
            error_color('NONVERBOSE BUILD', 'red'),
            error_color(':', 'yellow'),
            $line;
+
+    return;
 }
 sub error_invalid_cmake {
     my ($version) = @_;
@@ -335,12 +340,16 @@ sub error_invalid_cmake {
             error_color('INVALID CMAKE', 'red'),
             error_color(':', 'yellow'),
             $version;
+
+    return;
 }
 sub error_hardening_wrapper {
     printf "%s%s %s\n",
             error_color('HARDENING WRAPPER', 'red'),
             error_color(':', 'yellow'),
             'no checks possible, aborting';
+
+    return;
 }
 sub error_color {
     my ($message, $color) = @_;
@@ -477,6 +486,8 @@ sub remove_flags {
                         or not exists $removes{$flag_renames_ref->{$_}})
         } @{$flags};
     }
+
+    return;
 }
 
 sub compile_flag_regexp {