From 8780c64e5e91114e190540b63b3ad14903f47ee9 Mon Sep 17 00:00:00 2001
From: Matteo Cypriani <matteo.cypriani@uqat.ca>
Date: Fri, 17 May 2013 16:54:12 -0400
Subject: [PATCH] Makefiles: improve detection of compilers

---
 common.mk | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/common.mk b/common.mk
index e71e3c1..5322882 100644
--- a/common.mk
+++ b/common.mk
@@ -56,22 +56,22 @@ SYMLINK := ln -sf
 
 # C compiler
 ifeq "$(origin CC)" "default"
-	CLANG := $(shell command -v clang >/dev/null ; echo $$?)
-	ifeq "$(CLANG)" "0"
-		CC := clang
+	CLANG := $(shell (command -v clang))
+	ifneq "$(CLANG)" ""
+		CC := $(CLANG)
 	else
-		COLORGCC := $(shell command -v colorgcc >/dev/null ; echo $$?)
-		ifeq "$(COLORGCC)" "0"
-			CC := colorgcc
+		COLORGCC := $(shell command -v colorgcc || command -v color-gcc)
+		ifneq "$(COLORGCC)" ""
+			CC := $(COLORGCC)
 		endif
 	endif
 endif
 
 # C++ compiler
 ifeq "$(origin CXX)" "default"
-	COLORGCC := $(shell which colorgcc >/dev/null 2>&1 ; echo $$?)
-	ifeq "$(COLORGCC)" "0"
-		CXX := colorgcc
+	COLORGCC := $(shell command -v colorgcc || command -v color-g++)
+	ifneq "$(COLORGCC)" ""
+		CXX := $(COLORGCC)
 	endif
 endif