Date: Sat, 6 Dec 2014 04:02:57 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275558 - projects/building-blocks/share/mk Message-ID: <201412060402.sB642vOY037202@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sat Dec 6 04:02:56 2014 New Revision: 275558 URL: https://svnweb.freebsd.org/changeset/base/275558 Log: ${CC} --version doesn't need to be queried if both COMPILER_TYPE and COMPILER_VERSION are known Modified: projects/building-blocks/share/mk/bsd.compiler.mk Modified: projects/building-blocks/share/mk/bsd.compiler.mk ============================================================================== --- projects/building-blocks/share/mk/bsd.compiler.mk Sat Dec 6 03:15:46 2014 (r275557) +++ projects/building-blocks/share/mk/bsd.compiler.mk Sat Dec 6 04:02:56 2014 (r275558) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412060402.sB642vOY037202>