From owner-svn-src-projects@FreeBSD.ORG  Fri May  2 01:39:45 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A5FB6524;
 Fri,  2 May 2014 01:39:45 +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 93A2416F3;
 Fri,  2 May 2014 01:39:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s421djXi060831;
 Fri, 2 May 2014 01:39:45 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s421djeu060829;
 Fri, 2 May 2014 01:39:45 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201405020139.s421djeu060829@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Fri, 2 May 2014 01:39:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r265210 - projects/bmake/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.17
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 May 2014 01:39:45 -0000

Author: sjg
Date: Fri May  2 01:39:44 2014
New Revision: 265210
URL: http://svnweb.freebsd.org/changeset/base/265210

Log:
  Some warnings depened on the version of clang, allow us to check.
  
  Reviewed by: obrien

Modified:
  projects/bmake/share/mk/bsd.compiler.mk
  projects/bmake/share/mk/bsd.sys.mk

Modified: projects/bmake/share/mk/bsd.compiler.mk
==============================================================================
--- projects/bmake/share/mk/bsd.compiler.mk	Fri May  2 01:39:30 2014	(r265209)
+++ projects/bmake/share/mk/bsd.compiler.mk	Fri May  2 01:39:44 2014	(r265210)
@@ -26,6 +26,11 @@ COMPILER_TYPE:=	clang
 
 .if ${COMPILER_TYPE} == "clang"
 COMPILER_FEATURES=	c++11
+.if !defined(_COMPILER_VERSION)
+_COMPILER_VERSION!=     ${CC} --version
+.endif
+# some warnings are version specific
+COMPILER_VERSION:= ${_COMPILER_VERSION:M[1-9].[0-9]*}
 .else
 COMPILER_FEATURES=
 .endif

Modified: projects/bmake/share/mk/bsd.sys.mk
==============================================================================
--- projects/bmake/share/mk/bsd.sys.mk	Fri May  2 01:39:30 2014	(r265209)
+++ projects/bmake/share/mk/bsd.sys.mk	Fri May  2 01:39:44 2014	(r265210)
@@ -67,7 +67,10 @@ CWARNFLAGS+=	-Wno-pointer-sign
 # is set to low values, these have to be disabled explicitly.
 .if ${COMPILER_TYPE} == "clang" && !defined(EARLY_BUILD)
 .if ${WARNS} <= 6
-CWARNFLAGS+=	-Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable
+CWARNFLAGS+=	-Wno-empty-body -Wno-string-plus-int
+.if ${COMPILER_VERSION} > 3.3
+CWARNFLAGS+=	-Wno-unused-const-variable
+.endif
 .endif # WARNS <= 6
 .if ${WARNS} <= 3
 CWARNFLAGS+=	-Wno-tautological-compare -Wno-unused-value\