Ignore more "./configure" false positives.

diff --git a/bin/blhc b/bin/blhc
index 210f0ac5a0511f8fcb829493c491b07d94015c9f..47d464c1b9b66f752bbf3e2a7ac54e75f957ff1d 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -268,7 +268,10 @@ foreach my $line (@input) {
     # Ignore false positives.
     #
     # ./configure summary.
-    next if $line =~ /^Compiler:\s+(cc|gcc|g\+\+|c\+\+)$/;
+    my $cc_regex = qr/(cc|(x86_64-linux-gnu-)?gcc|g\+\+|c\+\+)/;
+    next if $line =~ /^\s*(C|c)ompiler[\s.]*:\s+$cc_regex(\s-std=[a-z0-9:+]+)?\s*$/
+            or $line =~ /^\s*- (CC|CXX)\s*=\s*$cc_regex\s*$/
+            or $line =~ /^\s*-- Check for working (C|CXX) compiler: /;
 
     # Is this a compiler or linker command?
     my $compiler = 1;

diff --git a/t/logs/configure b/t/logs/configure
index 8e20f8f76e5407752dd2ba2af9f2a42440c83070..ac181a3039a55a5106ff52bb4755d3dff42c8be2 100644 (file)
--- a/t/logs/configure
+++ b/t/logs/configure
@@ -1,3 +1,45 @@
 # Output by configure or similar tools which should be ignored.
 
 Compiler:            gcc
+
+  compiler                    : gcc -std=gnu99
+
+  - General Compile FLAGS
+      - CC  = mpicc
+      - CXX = g++
+      - FC  = f95
+      - CPPFLAGS = -D_FORTIFY_SOURCE=2
+      - CFLAGS   = -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security
+      - CXXFLAGS = -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security
+      - FCFLAGS  = -g -O2
+      - LDLAGS   =  -Wl,--as-needed
+      - LIBS     =
+
+Configure summary:
+
+        Compiler....................:  gcc -std=gnu99
+        Compiler Flags..............:  -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security  -Wall -Wextra
+        Prefix......................:  /usr
+        Coding style checks.........:  no
+        Enable debug................:  yes
+
+Configuration:
+
+  Detected OS:           linux-gnu
+  Install path:          /usr
+  Compilation arch:      linux
+
+  Compiler:              x86_64-linux-gnu-gcc
+  Compiler flags:        -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security
+
+  Linker flags:          -rdynamic -Wl,-z,relro
+  Libraries:             -lm
+
+-- Check for working C compiler: /usr/bin/gcc
+-- Check for working C compiler: /usr/bin/gcc
+-- Check for working C compiler: /usr/bin/gcc -- works
+-- Check for working C compiler: /usr/bin/gcc -- works
+-- Check for working CXX compiler: /usr/bin/c++
+-- Check for working CXX compiler: /usr/bin/c++
+-- Check for working CXX compiler: /usr/bin/c++ -- works
+-- Check for working CXX compiler: /usr/bin/c++ -- works