Fix false positive in libtool detection with quoted path

[blhc/blhc.git] / bin / blhc

diff --git a/bin/blhc b/bin/blhc
index 446ffb367a988c452460b45ced892d5ef6c3540e..d6e269091878869dbe8ab371ae954913003af2e8 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -53,7 +53,7 @@ my $cc_regex_normal = qr/
 my $warning_regex = qr/^(.+?):(\d+):\d+: warning: (.+?) \[(.+?)\]$/;
 # Regex to catch libtool commands and not lines which show commands executed
 # by libtool (e.g. libtool: link: ...).
-my $libtool_regex = qr/\blibtool\s.*--mode=/;
+my $libtool_regex = qr/\blibtool["']?\s.*--mode=/;
 my $libtool_link_regex = qr/\blibtool: link: /;
 
 # List of source file extensions which require preprocessing.
@@ -544,7 +544,7 @@ sub is_non_verbose_build {
     return 0 if $line =~ /^\s*C\+\+.+?:\s+(?:yes|no)\s*$/;
     return 0 if $line =~ /^\s*C\+\+ Library: stdc\+\+$/;
     # "Compiling" non binary files.
-    return 0 if $line =~ /^\s*Compiling \S+\.(?:py|el)['"]?\s*(?:\.\.\.)?$/;
+    return 0 if $line =~ /^\s*Compiling \S+\.(?:py|pyx|el)['"]?\s*(?:\.\.\.|because it changed\.)?$/;
     return 0 if $line =~ /^\s*[Cc]ompiling catalog \S+\.po\b/;
     # "Compiling" with no file name.
     if ($line =~ /^\s*[Cc]ompiling\s+(.+?)(?:\.\.\.)?$/) {
@@ -1200,12 +1200,12 @@ foreach my $file (@ARGV) {
     # information. Same for fortran.
     my @cflags_backup;
     my @cflags_noformat = grep {
-            my $ok = 1;
-            foreach my $flag (@def_cflags_format) {
-                $ok = 0 if $_ eq $flag;
-            }
-            $ok;
-        } @cflags;
+        my $ok = 1;
+        foreach my $flag (@def_cflags_format) {
+            $ok = 0 if $_ eq $flag;
+        }
+        $ok;
+    } @cflags;
 
     # Hack to fix cppflags_fortify_broken() if --ignore-flag
     # -D_FORTIFY_SOURCE=2 is used to ignore missing fortification. Only works