Improve compiler regex to be more compatible.

diff --git a/bin/blhc b/bin/blhc
index 527a09866e59214cdb620e007c8f74796e94084b..a29313dfffb97dc2bee2b74f9c9f8e729f045ac6 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -30,7 +30,9 @@ our $VERSION = '0.01';
 # CONSTANTS/VARIABLES
 
 # Regex to catch compiler commands.
 # 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: (.+?) \[(.+?)\]$/;
 
 # 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 ba830e7cf9978e9397d974a22dfb5a44f7e0fdaa..6955d9ab361085492222cd0b454d6d62f20b797a 100644 (file)
--- a/t/logs/configure
+++ b/t/logs/configure
@@ -8,6 +8,18 @@ Compiler:            gcc
 
     C Compiler:                                gcc -std=gnu99
 
 
     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++
   - General Compile FLAGS
       - CC  = mpicc
       - CXX = g++