Prepare for multiple 'Build-Depends' checks.

[blhc/blhc.git] / bin / blhc

diff --git a/bin/blhc b/bin/blhc
index 57ea0005df4f17712ef3e775d0e6ba8f1a829f12..75888b86835469f3de4aa00898670084893f8801 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -90,10 +90,14 @@ my @source_no_preprocess_compile = (
     qw( mi ),
     # Fortran
     qw( f for ftn f90 f95 f03 f08 ),
+    # Ada body
+    qw( adb ),
 );
 my @source_no_preprocess_no_compile = (
     # Assembly
     qw( s ),
+    # Ada specification
+    qw( ads ),
 );
 my @source_no_preprocess = (
     @source_no_preprocess_compile,
@@ -430,8 +434,8 @@ sub is_non_verbose_build {
         $file = $1;
 
         if (index($next_line, $file) != -1 and $next_line =~ /$cc_regex/o) {
-            # We still have to skip the current line as it doesn't contain any
-            # compiler commands.
+            # Not a non-verbose line, but we still have to skip the current line
+            # as it doesn't contain any compiler commands.
             ${$skip_ref} = 1;
             return 0;
         }
@@ -682,17 +686,19 @@ foreach my $file (@ARGV) {
             }
         }
 
-        # If hardening wrapper is used (wraps calls to gcc and adds hardening
-        # flags automatically) we can't perform any checks, abort.
-        if (index($line, 'Build-Depends: ') == 0
-                and $line =~ /\bhardening-wrapper\b/) {
-            if (not $option_buildd) {
-                error_hardening_wrapper();
-                $exit |= $exit_code{hardening_wrapper};
-            } else {
-                print "$buildd_tag{hardening_wrapper}||\n";
+        if (index($line, 'Build-Depends: ') == 0) {
+            # If hardening wrapper is used (wraps calls to gcc and adds
+            # hardening flags automatically) we can't perform any checks,
+            # abort.
+            if ($line =~ /\bhardening-wrapper\b/) {
+                if (not $option_buildd) {
+                    error_hardening_wrapper();
+                    $exit |= $exit_code{hardening_wrapper};
+                } else {
+                    print "$buildd_tag{hardening_wrapper}||\n";
+                }
+                next FILE;
             }
-            next FILE;
         }
 
         # We skip over unimportant lines at the beginning of the log to