svn commit: r198365 - head/share/mk

[Ruslan Ermilov]

Author: ru
Date: Thu Oct 22 11:45:35 2009
New Revision: 198365
URL: http://svn.freebsd.org/changeset/base/198365

Log:
  Unbreak NO_WARNS, keeping CSTD effect on CFLAGS out of its control.
  Unbreak compiles with icc.

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

Modified: head/share/mk/bsd.sys.mk
==============================================================================
--- head/share/mk/bsd.sys.mk	Thu Oct 22 11:38:19 2009	(r198364)
+++ head/share/mk/bsd.sys.mk	Thu Oct 22 11:45:35 2009	(r198365)
@@ -11,7 +11,7 @@
 # the default is gnu99 for now
 CSTD		?= gnu99
 
-.if !defined(NO_WARNS) || ${CC} != "icc"
+.if ${CC} != "icc"
 . if ${CSTD} == "k&r"
 CFLAGS		+= -traditional
 . elif ${CSTD} == "c89" || ${CSTD} == "c90"
@@ -23,6 +23,8 @@ CFLAGS		+= -std=iso9899:1999
 . else
 CFLAGS		+= -std=${CSTD}
 . endif
+.endif
+.if !defined(NO_WARNS) && ${CC} != "icc"
 # -pedantic is problematic because it also imposes namespace restrictions
 #CFLAGS		+= -pedantic
 . if defined(WARNS)