From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 18 Mar 2012 00:33:21 +0000 (+0100)
Subject: Improve compiler regex to be more compatible.
X-Git-Tag: 0.01~91
X-Git-Url: https://ruderich.org/simon/gitweb/?p=blhc%2Fblhc.git;a=commitdiff_plain;h=7e824086332291bdf968c3c45f350964295c005e

Improve compiler regex to be more compatible.
---

diff --git a/bin/blhc b/bin/blhc
index 527a098..a29313d 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -30,7 +30,9 @@ our $VERSION = '0.01';
 # CONSTANTS/VARIABLES
 
 # Regex to catch compiler commands.
-my $cc_regex = qr/(?:x86_64-linux-gnu-)?(?:(?<!\.)cc|gcc|g\+\+|c\+\+)(?:-[\d.]+)?/;
+my $cc_regex = qr/(?:[a-z0-9_]+-(?:linux|kfreebsd)-gnu(?:eabi|eabihf)?-)?
+                  (?:(?<!\.)cc|gcc|g\+\+|c\+\+)
+                  (?:-[\d.]+)?/x;
 # Regex to catch (GCC) compiler warnings.
 my $warning_regex = qr/^(.+?):([0-9]+):[0-9]+: warning: (.+?) \[(.+?)\]$/;
 
diff --git a/t/logs/configure b/t/logs/configure
index ba830e7..6955d9a 100644
--- a/t/logs/configure
+++ b/t/logs/configure
@@ -8,6 +8,18 @@ Compiler:            gcc
 
     C Compiler:                                gcc -std=gnu99
 
+  Compiler:              arm-linux-gnueabi-gcc
+  Compiler:              arm-linux-gnueabihf-gcc
+  Compiler:              i486-linux-gnu-gcc
+  Compiler:              ia64-linux-gnu-gcc
+  Compiler:              x86_64-kfreebsd-gnu-gcc
+  Compiler:              i486-kfreebsd-gnu-gcc
+  Compiler:              mips-linux-gnu-gcc
+  Compiler:              mipsel-linux-gnu-gcc
+  Compiler:              powerpc-linux-gnu-gcc
+  Compiler:              s390-linux-gnu-gcc
+  Compiler:              sparc-linux-gnu-gcc
+
   - General Compile FLAGS
       - CC  = mpicc
       - CXX = g++