Handle another configure false positive.

diff --git a/bin/blhc b/bin/blhc
index d8c621bddbfd853a9bec9a552f0e6de8d24106a4..d089931fa04de504f151fdda83a87c4cf7352f60 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -325,6 +325,10 @@ while (my $line = <>) {
             #
             # `./configure` output.
             next if not $non_verbose and $line =~ /^checking /;
+            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: /
+                    or $line =~ /^\s*(?:echo )?Using [A-Z_]+\s*=\s*/;
 
             push @input, $line;
         }
@@ -399,12 +403,6 @@ for (my $i = 0; $i < scalar @input; $i++) {
     # Even if it's a verbose build, we might have to skip this line.
     next if $skip;
 
-    # Ignore false positives.
-    #
-    # ./configure summary.
-    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 46e0bf7a27f6fd1b1bcddaba6fac516da8cea207..039535b1e14d1203c724e2a7e55e13b350fd4aca 100644 (file)
--- a/t/logs/configure
+++ b/t/logs/configure
@@ -48,3 +48,12 @@ Configuration:
 
 configure: using CFLAGS=-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -fPIC
 configure: using LDFLAGS=-Wl,-z,relro -Wl,--as-needed -Wl,-z,now  -Wl,--as-needed
+
+echo Using CC="gcc"
+Using CC=gcc
+echo Using CXX="gcc"
+Using CXX=gcc
+echo Using ALL_CFLAGS="-D_FORTIFY_SOURCE=2  -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security"
+Using ALL_CFLAGS=-D_FORTIFY_SOURCE=2  -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security
+echo Using LDFLAGS="-Wl,-z,relro -Wl,--as-needed -fPIE -pie -Wall"
+Using LDFLAGS=-Wl,-z,relro -Wl,--as-needed -fPIE -pie -Wall

diff --git a/t/tests.t b/t/tests.t
index 387ac2e3ba8ee7f95002d9a4bc8adda699f45f0c..fa1eab87568111246d4400952de117dd20a27de8 100644 (file)
--- a/t/tests.t
+++ b/t/tests.t
@@ -329,8 +329,9 @@ CFLAGS missing (-Werror=format-security): cd /tmp/test/src && /usr/bin/gcc -g -O
 
 # configure
 
-is_blhc 'configure', '', 0,
-        '';
+is_blhc 'configure', '', 1,
+        'No compiler commands!
+';
 
 
 # cc