svn commit: r242633 - head/share/mk

Brooks Davis brooks at FreeBSD.org
Mon Nov 5 23:05:14 UTC 2012


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}


More information about the svn-src-head mailing list