From owner-svn-src-projects@FreeBSD.ORG  Mon Oct 19 17:47:19 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3B26A1065672;
	Mon, 19 Oct 2009 17:47:19 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 240988FC0C;
	Mon, 19 Oct 2009 17:47:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9JHlJmU008315;
	Mon, 19 Oct 2009 17:47:19 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9JHlJ9a008313;
	Mon, 19 Oct 2009 17:47:19 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200910191747.n9JHlJ9a008313@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Mon, 19 Oct 2009 17:47:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198239 - projects/clangbsd/share/mk
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Oct 2009 17:47:19 -0000

Author: rdivacky
Date: Mon Oct 19 17:47:18 2009
New Revision: 198239
URL: http://svn.freebsd.org/changeset/base/198239

Log:
  Revert the previous commit and make it so that the CSTD is ignored
  if CC=icc and NO_WARNS is defined. Use CSTD for all other cases.

Modified:
  projects/clangbsd/share/mk/bsd.sys.mk

Modified: projects/clangbsd/share/mk/bsd.sys.mk
==============================================================================
--- projects/clangbsd/share/mk/bsd.sys.mk	Mon Oct 19 17:41:32 2009	(r198238)
+++ projects/clangbsd/share/mk/bsd.sys.mk	Mon Oct 19 17:47:18 2009	(r198239)
@@ -11,7 +11,7 @@
 # the default is gnu99 for now
 CSTD		?= gnu99
 
-.if ${CC} != "icc"
+.if !defined(NO_WARNS) || ${CC} != "icc"
 . if ${CSTD} == "k&r"
 CFLAGS		+= -traditional
 . elif ${CSTD} == "c89" || ${CSTD} == "c90"