svn commit: r212520 - user/imp/tbemd/sys/conf

[Warner Losh]

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}