svn commit: r357521 - in stable: 11/share/mk 11/usr.bin/lex 12/share/mk 12/usr.bin/lex

[Dimitry Andric]

Author: dim
Date: Tue Feb  4 19:42:57 2020
New Revision: 357521
URL: https://svnweb.freebsd.org/changeset/base/357521

Log:
  MFC r357347:
  
  Merge r357345 from the clang1000-import branch:
  
  Disable new clang 10.0.0 warnings about misleading indentation in flex.
  
  As this is contributed code with very messy indentation, which will
  almost certainly never be upgraded, just disable the warning.

Modified:
  stable/11/share/mk/bsd.sys.mk
  stable/11/usr.bin/lex/Makefile
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/12/share/mk/bsd.sys.mk
  stable/12/usr.bin/lex/Makefile
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/share/mk/bsd.sys.mk
==============================================================================
--- stable/11/share/mk/bsd.sys.mk	Tue Feb  4 19:35:40 2020	(r357520)
+++ stable/11/share/mk/bsd.sys.mk	Tue Feb  4 19:42:57 2020	(r357521)
@@ -104,6 +104,11 @@ CWARNFLAGS.clang+=	-Wno-parentheses
 .if defined(NO_WARRAY_BOUNDS)
 CWARNFLAGS.clang+=	-Wno-array-bounds
 .endif # NO_WARRAY_BOUNDS
+.if defined(NO_WMISLEADING_INDENTATION) && \
+    ((${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 100000) || \
+     (${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 60100))
+CWARNFLAGS+=		-Wno-misleading-indentation
+.endif # NO_WMISLEADING_INDENTATION
 .endif # WARNS
 
 .if defined(FORMAT_AUDIT)
@@ -146,8 +151,7 @@ CWARNFLAGS+=	-Wno-error=address			\
 
 # GCC 6.1.0
 .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 60100
-CWARNFLAGS+=	-Wno-error=misleading-indentation	\
-		-Wno-error=nonnull-compare		\
+CWARNFLAGS+=	-Wno-error=nonnull-compare		\
 		-Wno-error=shift-negative-value		\
 		-Wno-error=tautological-compare		\
 		-Wno-error=unused-const-variable

Modified: stable/11/usr.bin/lex/Makefile
==============================================================================
--- stable/11/usr.bin/lex/Makefile	Tue Feb  4 19:35:40 2020	(r357520)
+++ stable/11/usr.bin/lex/Makefile	Tue Feb  4 19:42:57 2020	(r357521)
@@ -32,6 +32,8 @@ MLINKS+=	lex.1 lex++.1
 
 WARNS?=		3
 
+NO_WMISLEADING_INDENTATION=
+
 CLEANFILES=	scan.c skel.c
 GENFILES=	parse.c parse.h scan.c skel.c