From 5072df676d796709e34af7dd8d6797dec1d946b2 Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Thu, 22 Mar 2012 14:44:12 +0100
Subject: [PATCH] Ignore compiler when used as file suffixes.

For example "rm test.gcc" isn't a compiler line.
---
 bin/blhc   | 2 +-
 t/logs/c++ | 4 ++++
 t/logs/cc  | 2 ++
 t/logs/g++ | 2 ++
 t/logs/gcc | 2 ++
 t/tests.t  | 3 +++
 6 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/bin/blhc b/bin/blhc
index 666c2af..9aa0133 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -32,7 +32,7 @@ our $VERSION = '0.01';
 
 # Regex to catch compiler commands.
 my $cc_regex = qr/(?:[a-z0-9_]+-(?:linux-|kfreebsd-)?gnu(?:eabi|eabihf)?-)?
-                  (?:(?<!\.)cc|gcc|g\+\+|c\+\+)
+                  (?<!\.)(?: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/c++ b/t/logs/c++
index 34d7419..3e988d3 100644
--- a/t/logs/c++
+++ b/t/logs/c++
@@ -18,6 +18,10 @@ rm c++test.h
 c++\
     test.c
 
+rm test.c++
+c++\
+    test.c++
+
 c++-4.6 -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-a.cpp
 c++-4.6 -g -O2 -fstack-protector -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-b.cpp
 c++-4.6 -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -c test-c.cpp
diff --git a/t/logs/cc b/t/logs/cc
index 49df5c7..4fbfca6 100644
--- a/t/logs/cc
+++ b/t/logs/cc
@@ -10,4 +10,6 @@ rm cc-test.h
 cc\
     test.cc
 
+rm test.cc
+
 cc -Wl,-z,defs test-a.o test-b.o test-c.o -ltest -Wl,-z,relro -o test/test-4.2~_4711/test.so test.o
diff --git a/t/logs/g++ b/t/logs/g++
index 3c372a1..cd3cc07 100644
--- a/t/logs/g++
+++ b/t/logs/g++
@@ -25,6 +25,8 @@ rm g++test.h
 g++\
     test.c
 
+rm test.g++
+
 g++-4.6 -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-a.cpp
 g++-4.6 -g -O2 -fstack-protector -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-b.cpp
 g++-4.6 -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -c test-c.cpp
diff --git a/t/logs/gcc b/t/logs/gcc
index def411d..802b6f1 100644
--- a/t/logs/gcc
+++ b/t/logs/gcc
@@ -12,4 +12,6 @@ rm gcc-test.h
 gcc\
     test.c
 
+rm test.gcc
+
 gcc-4.6 -Wl,-z,defs test-a.o test-b.o test-c.o -ltest -Wl,-z,relro -o test/test-4.2~_4711/test.so test.o
diff --git a/t/tests.t b/t/tests.t
index 555b5be..c462cfc 100644
--- a/t/tests.t
+++ b/t/tests.t
@@ -446,6 +446,9 @@ LDFLAGS missing (-fPIE -pie -Wl,-z,now): c++ -Wl,-z,defs test-a.o test-b.o test-
 CFLAGS missing (-g -O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security): c++\     test.c
 CPPFLAGS missing (-D_FORTIFY_SOURCE=2): c++\     test.c
 LDFLAGS missing (-fPIE -pie -Wl,-z,relro -Wl,-z,now): c++\     test.c
+CFLAGS missing (-g -O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security): c++\     test.c++
+CPPFLAGS missing (-D_FORTIFY_SOURCE=2): c++\     test.c++
+LDFLAGS missing (-fPIE -pie -Wl,-z,relro -Wl,-z,now): c++\     test.c++
 CFLAGS missing (-fPIE -Wformat): c++-4.6 -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-a.cpp
 CFLAGS missing (-fPIE --param=ssp-buffer-size=4): c++-4.6 -g -O2 -fstack-protector -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-b.cpp
 CFLAGS missing (-fPIE -Werror=format-security): c++-4.6 -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -c test-c.cpp
-- 
2.43.2