svn commit: r303453 - in head: share/mk sys/conf

[Ruslan Bukin]

Author: br
Date: Thu Jul 28 17:18:02 2016
New Revision: 303453
URL: https://svnweb.freebsd.org/changeset/base/303453

Log:
  Normalise the CWARNFLAGS inter-word spacing: remove all leading
  and trailing space, and convert multiple consecutive spaces to
  single space.
  
  This helps to keep build output looking good.

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

Modified: head/share/mk/bsd.sys.mk
==============================================================================
--- head/share/mk/bsd.sys.mk	Thu Jul 28 16:54:12 2016	(r303452)
+++ head/share/mk/bsd.sys.mk	Thu Jul 28 17:18:02 2016	(r303453)
@@ -190,7 +190,7 @@ CFLAGS+=	${SSP_CFLAGS}
 # Allow user-specified additional warning flags, plus compiler and file
 # specific flag overrides, unless we've overriden this...
 .if ${MK_WARNS} != "no"
-CFLAGS+=	${CWARNFLAGS} ${CWARNFLAGS.${COMPILER_TYPE}}
+CFLAGS+=	${CWARNFLAGS:M*} ${CWARNFLAGS.${COMPILER_TYPE}}
 CFLAGS+=	${CWARNFLAGS.${.IMPSRC:T}}
 .endif
 

Modified: head/sys/conf/kern.mk
==============================================================================
--- head/sys/conf/kern.mk	Thu Jul 28 16:54:12 2016	(r303452)
+++ head/sys/conf/kern.mk	Thu Jul 28 17:18:02 2016	(r303453)
@@ -214,7 +214,7 @@ CFLAGS+=	-fstack-protector
 CFLAGS+=	-gdwarf-2
 .endif
 
-CFLAGS+= ${CWARNFLAGS} ${CWARNFLAGS.${.IMPSRC:T}}
+CFLAGS+= ${CWARNFLAGS:M*} ${CWARNFLAGS.${.IMPSRC:T}}
 CFLAGS+= ${CFLAGS.${COMPILER_TYPE}} ${CFLAGS.${.IMPSRC:T}}
 
 # Tell bmake not to mistake standard targets for things to be searched for