]> ruderich.org/simon Gitweb - blhc/blhc.git/commitdiff
Handle more configure false positives.
authorSimon Ruderich <simon@ruderich.org>
Tue, 20 Mar 2012 19:45:11 +0000 (20:45 +0100)
committerSimon Ruderich <simon@ruderich.org>
Tue, 20 Mar 2012 19:45:11 +0000 (20:45 +0100)
bin/blhc
t/logs/configure

index 7075ec812c7076485866279e4258fe03999a6c30..bf5f8ff58dc1edddd4208c703ee8c702d808266a 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -357,12 +357,12 @@ while (my $line = <>) {
             #
             # `./configure` output.
             next if not $non_verbose and $line =~ /^checking /;
-            next if $line =~ /^\s*(?:C\s+)?
-                               (?:C|c)ompiler[\s.]*:\s+
+            next if $line =~ /^\s*(?:Host\s+)?(?:C\s+)?
+                               (?:C|c)ompiler[\s.]*:?\s+
                                $cc_regex
                                (?:\s-std=[a-z0-9:+]+)?\s*$
                              /x
-                    or $line =~ /^\s*(?:- )?(?:CC|CXX)\s*=\s*$cc_regex\s*$/
+                    or $line =~ /^\s*(?:- )?(?:HOST_)?(?: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*/;
             # Debian buildd output.
index 6955d9ab361085492222cd0b454d6d62f20b797a..1403036e2e928c9ef4d48dcbf71a1520ad7c849d 100644 (file)
@@ -8,6 +8,13 @@ Compiler:            gcc
 
     C Compiler:                                gcc -std=gnu99
 
+C compiler                gcc
+
+C compiler        gcc
+Host C compiler   gcc
+
+  compiler                    cc
+
   Compiler:              arm-linux-gnueabi-gcc
   Compiler:              arm-linux-gnueabihf-gcc
   Compiler:              i486-linux-gnu-gcc
@@ -73,3 +80,7 @@ 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
+
+CC=gcc
+CC_I386=$(CC) -m32
+HOST_CC=gcc