From owner-svn-src-stable-8@FreeBSD.ORG  Fri Aug 23 13:19:12 2013
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 9BB90B33;
 Fri, 23 Aug 2013 13:19:12 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 88F04269D;
 Fri, 23 Aug 2013 13:19:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7NDJCgo050407;
 Fri, 23 Aug 2013 13:19:12 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7NDJCqg050406;
 Fri, 23 Aug 2013 13:19:12 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201308231319.r7NDJCqg050406@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Fri, 23 Aug 2013 13:19:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r254691 - stable/8/share/mk
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
 <svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-8>, 
 <mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
 <mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Aug 2013 13:19:12 -0000

Author: avg
Date: Fri Aug 23 13:19:12 2013
New Revision: 254691
URL: http://svnweb.freebsd.org/changeset/base/254691

Log:
  MFC r198335,198365: remove dependency between NO_WARNS and CSTD
  
  There is no reason to have it.
  
  Reviewed by:	dim
  MFC slackers:	rdivacky, ru

Modified:
  stable/8/share/mk/bsd.sys.mk
Directory Properties:
  stable/8/share/mk/   (props changed)

Modified: stable/8/share/mk/bsd.sys.mk
==============================================================================
--- stable/8/share/mk/bsd.sys.mk	Fri Aug 23 13:14:18 2013	(r254690)
+++ stable/8/share/mk/bsd.sys.mk	Fri Aug 23 13:19:12 2013	(r254691)
@@ -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)