svn commit: r275588 - head/share/mk

[Garrett Cooper]

Author: ngie
Date: Mon Dec  8 03:30:42 2014
New Revision: 275588
URL: https://svnweb.freebsd.org/changeset/base/275588

Log:
  ${CC} --version doesn't need to be queried if both COMPILER_TYPE and
  COMPILER_VERSION are known

Modified:
  head/share/mk/bsd.compiler.mk
Directory Properties:
  head/   (props changed)
  head/share/   (props changed)

Modified: head/share/mk/bsd.compiler.mk
==============================================================================
--- head/share/mk/bsd.compiler.mk	Sun Dec  7 23:59:44 2014	(r275587)
+++ head/share/mk/bsd.compiler.mk	Mon Dec  8 03:30:42 2014	(r275588)
@@ -25,6 +25,7 @@
 .if !target(__<bsd.compiler.mk>__)
 __<bsd.compiler.mk>__:
 
+.if !defined(COMPILER_TYPE) && !defined(COMPILER_VERSION)
 _v!=	${CC} --version 2>/dev/null || echo 0.0.0
 .if !defined(COMPILER_TYPE)
 . if ${CC:T:M*gcc*}
@@ -45,6 +46,7 @@ COMPILER_TYPE:=	clang
 COMPILER_VERSION!=echo ${_v:M[1-9].[0-9]*} | awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3;}'
 .endif
 .undef _v
+.endif
 
 .if ${COMPILER_TYPE} == "clang" || \
 	(${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40800)