From owner-svn-src-all@FreeBSD.ORG  Wed Oct 21 17:07:46 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 67D591065670;
	Wed, 21 Oct 2009 17:07:46 +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 572328FC1E;
	Wed, 21 Oct 2009 17:07:46 +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 n9LH7kh3005206;
	Wed, 21 Oct 2009 17:07:46 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9LH7kHx005204;
	Wed, 21 Oct 2009 17:07:46 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200910211707.n9LH7kHx005204@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Wed, 21 Oct 2009 17:07:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198335 - head/share/mk
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Oct 2009 17:07:46 -0000

Author: rdivacky
Date: Wed Oct 21 17:07:46 2009
New Revision: 198335
URL: http://svn.freebsd.org/changeset/base/198335

Log:
  Set CSTD in all cases except when CC=icc and NO_WARNS is set. This
  way we can set desired C standard even for cross tools etc.
  
  Tested by:	make universe
  Approved by:	ed (maintainer)
  OK by:		das

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

Modified: head/share/mk/bsd.sys.mk
==============================================================================
--- head/share/mk/bsd.sys.mk	Wed Oct 21 16:12:09 2009	(r198334)
+++ head/share/mk/bsd.sys.mk	Wed Oct 21 17:07:46 2009	(r198335)
@@ -11,7 +11,7 @@
 # the default is gnu99 for now
 CSTD		?= gnu99
 
-.if !defined(NO_WARNS) && ${CC} != "icc"
+.if !defined(NO_WARNS) || ${CC} != "icc"
 . if ${CSTD} == "k&r"
 CFLAGS		+= -traditional
 . elif ${CSTD} == "c89" || ${CSTD} == "c90"