Be more liberal in non-verbose file name checks.

[blhc/blhc.git] / bin / blhc

diff --git a/bin/blhc b/bin/blhc
index ad98dc594355431609fa8a91fc83309f5605d7a6..bfd4be861d15c8571833e2b43c7e8aa2910bf1be 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -172,8 +172,7 @@ my @def_cflags_pie = (
     '-fPIE',
 );
 my @def_cxxflags = (
-    '-g',
-    '-O(?:2|3)',
+    @def_cflags,
 );
 # @def_cxxflags_* is the same as @def_cflags_*.
 my @def_cppflags = ();
@@ -318,7 +317,7 @@ sub is_non_verbose_build {
     if (defined $file) {
         # Get filename, we can't use the complete path as only parts of it are
         # used in the real compiler command.
-        $file =~ m{/([a-zA-Z0-9._-]+)$};
+        $file =~ m{/([^/\s]+)$};
         $file = $1;
 
         if ($next_line =~ /\Q$file\E/ and $next_line =~ /$cc_regex/o) {