From owner-svn-src-user@FreeBSD.ORG  Mon Sep 13 02:01:29 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9E8BD106566C;
	Mon, 13 Sep 2010 02:01:29 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8E8DC8FC08;
	Mon, 13 Sep 2010 02:01:29 +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 o8D21Te3046760;
	Mon, 13 Sep 2010 02:01:29 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8D21TFs046757;
	Mon, 13 Sep 2010 02:01:29 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201009130201.o8D21TFs046757@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 13 Sep 2010 02:01:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212520 - user/imp/tbemd/sys/conf
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Sep 2010 02:01:29 -0000

Author: imp
Date: Mon Sep 13 02:01:29 2010
New Revision: 212520
URL: http://svn.freebsd.org/changeset/base/212520

Log:
  Use T:Micc for icc tests

Modified:
  user/imp/tbemd/sys/conf/kern.mk
  user/imp/tbemd/sys/conf/kern.pre.mk

Modified: user/imp/tbemd/sys/conf/kern.mk
==============================================================================
--- user/imp/tbemd/sys/conf/kern.mk	Mon Sep 13 01:58:17 2010	(r212519)
+++ user/imp/tbemd/sys/conf/kern.mk	Mon Sep 13 02:01:29 2010	(r212520)
@@ -29,7 +29,7 @@ CWARNFLAGS?=	-Wall -Wredundant-decls -Wn
 # operations inside the kernel itself.  These operations are exclusively
 # reserved for user applications.
 #
-.if ${MACHINE_CPUARCH} == "i386" && ${CC} != "icc"
+.if ${MACHINE_CPUARCH} == "i386" && ${CC:T:Micc} != "icc"
 .if ${CC:T:Mclang} != "clang"
 CFLAGS+=	-mno-align-long-strings -mpreferred-stack-boundary=2
 .endif

Modified: user/imp/tbemd/sys/conf/kern.pre.mk
==============================================================================
--- user/imp/tbemd/sys/conf/kern.pre.mk	Mon Sep 13 01:58:17 2010	(r212519)
+++ user/imp/tbemd/sys/conf/kern.pre.mk	Mon Sep 13 02:01:29 2010	(r212520)
@@ -42,7 +42,7 @@ COPTFLAGS+= -fno-strict-aliasing
 . endif
 .endif
 .if !defined(NO_CPU_COPTFLAGS)
-. if ${CC} == "icc"
+. if ${CC:T:Micc} == "icc"
 COPTFLAGS+= ${_ICC_CPUCFLAGS:C/(-x[^M^K^W]+)[MKW]+|-x[MKW]+/\1/}
 . else
 COPTFLAGS+= ${_CPUCFLAGS}