svn commit: r265210 - projects/bmake/share/mk

[Simon J. Gerraty]

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\