From owner-svn-src-all@FreeBSD.ORG  Mon Nov  5 23:05:14 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 89450A59;
 Mon,  5 Nov 2012 23:05:14 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6F9208FC12;
 Mon,  5 Nov 2012 23:05:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA5N5E98011472;
 Mon, 5 Nov 2012 23:05:14 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA5N5Ene011470;
 Mon, 5 Nov 2012 23:05:14 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201211052305.qA5N5Ene011470@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Mon, 5 Nov 2012 23:05:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242633 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Nov 2012 23:05:14 -0000

Author: brooks
Date: Mon Nov  5 23:05:14 2012
New Revision: 242633
URL: http://svnweb.freebsd.org/changeset/base/242633

Log:
  Allow CC to be gcc46 or similar by matching gcc*.
  
  Don't test the value of the :M matches, either the string matches or does
  not.

Modified:
  head/share/mk/bsd.compiler.mk

Modified: head/share/mk/bsd.compiler.mk
==============================================================================
--- head/share/mk/bsd.compiler.mk	Mon Nov  5 22:54:00 2012	(r242632)
+++ head/share/mk/bsd.compiler.mk	Mon Nov  5 23:05:14 2012	(r242633)
@@ -1,17 +1,17 @@
 # $FreeBSD$
 
 .if !defined(COMPILER_TYPE)
-. if ${CC:T:Mgcc} == "gcc"
+. if ${CC:T:Mgcc*}
 COMPILER_TYPE:=	gcc  
-. elif ${CC:T:Mclang} == "clang"
+. elif ${CC:T:Mclang}
 COMPILER_TYPE:=	clang
 . else
 _COMPILER_VERSION!=	${CC} --version
-.  if ${_COMPILER_VERSION:Mgcc} == "gcc"
+.  if ${_COMPILER_VERSION:Mgcc}
 COMPILER_TYPE:=	gcc
-.  elif ${_COMPILER_VERSION:M\(GCC\)} == "(GCC)"
+.  elif ${_COMPILER_VERSION:M\(GCC\)}
 COMPILER_TYPE:=	gcc
-.  elif ${_COMPILER_VERSION:Mclang} == "clang"
+.  elif ${_COMPILER_VERSION:Mclang}
 COMPILER_TYPE:=	clang
 .  else
 .error Unable to determing compiler type for ${CC}