svn commit: r327161 - head/share/mk

[Dimitry Andric]

Author: dim
Date: Sun Dec 24 16:34:54 2017
New Revision: 327161
URL: https://svnweb.freebsd.org/changeset/base/327161

Log:
  Follow-up to r326375, by moving the block that disables errors on the
  new clang 6.0.0 -Wtautological-constant-compare warning to the WARNS <=
  6 level.  (This warning is still being worked on upstream to reduce
  false positives, but it is currently still too trigger happy.)

Modified:
  head/share/mk/bsd.sys.mk

Modified: head/share/mk/bsd.sys.mk
==============================================================================
--- head/share/mk/bsd.sys.mk	Sun Dec 24 14:05:25 2017	(r327160)
+++ head/share/mk/bsd.sys.mk	Sun Dec 24 16:34:54 2017	(r327161)
@@ -69,8 +69,11 @@ CWARNFLAGS+=	-Wno-pointer-sign
 .if ${WARNS} <= 6
 CWARNFLAGS.clang+=	-Wno-empty-body -Wno-string-plus-int
 .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 30400
-CWARNFLAGS.clang+= -Wno-unused-const-variable
+CWARNFLAGS.clang+=	-Wno-unused-const-variable
 .endif
+.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 60000
+CWARNFLAGS.clang+=	-Wno-error=tautological-constant-compare
+.endif
 .endif # WARNS <= 6
 .if ${WARNS} <= 3
 CWARNFLAGS.clang+=	-Wno-tautological-compare -Wno-unused-value\
@@ -80,9 +83,6 @@ CWARNFLAGS.clang+=	-Wno-unused-local-typedef
 .endif
 .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 40000
 CWARNFLAGS.clang+=	-Wno-address-of-packed-member
-.endif
-.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 60000
-CWARNFLAGS.clang+=	-Wno-error=tautological-constant-compare
 .endif
 .endif # WARNS <= 3
 .if ${WARNS} <= 2