From: Simon Ruderich <simon@ruderich.org>
Date: Sat, 17 Mar 2012 22:11:12 +0000 (+0100)
Subject: Handle another configure false positive.
X-Git-Tag: 0.01~96
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=5b550dc892a6568f9f4ddc71106a7b879ee380c3;p=blhc%2Fblhc.git

Handle another configure false positive.
---

diff --git a/bin/blhc b/bin/blhc
index 9430479..1d1fc27 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -326,7 +326,7 @@ 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*(?:- )?(?: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*/;
 
diff --git a/t/logs/configure b/t/logs/configure
index 039535b..f8e1a27 100644
--- a/t/logs/configure
+++ b/t/logs/configure
@@ -57,3 +57,5 @@ echo Using ALL_CFLAGS="-D_FORTIFY_SOURCE=2  -g -O2 -fstack-protector --param=ssp
 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
+
+CC      = cc