From: Simon Ruderich Date: Tue, 20 Mar 2012 19:45:11 +0000 (+0100) Subject: Handle more configure false positives. X-Git-Tag: 0.01~82 X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=fa2e7db77f6c7c9ae52841d5b4cfc8d9a1f221a9;hp=176279c453afed1e0aab9db5283a92b1e92e1fb1;p=blhc%2Fblhc.git Handle more configure false positives. --- diff --git a/bin/blhc b/bin/blhc index 7075ec8..bf5f8ff 100755 --- 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. diff --git a/t/logs/configure b/t/logs/configure index 6955d9a..1403036 100644 --- a/t/logs/configure +++ b/t/logs/configure @@ -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