From owner-svn-src-projects@FreeBSD.ORG Sat Dec 6 04:02:57 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 857A4FC5; Sat, 6 Dec 2014 04:02:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6FEB596C; Sat, 6 Dec 2014 04:02:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB642v02037203; Sat, 6 Dec 2014 04:02:57 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB642vOY037202; Sat, 6 Dec 2014 04:02:57 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201412060402.sB642vOY037202@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 6 Dec 2014 04:02:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275558 - projects/building-blocks/share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Dec 2014 04:02:57 -0000 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(____) ____: +.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)