From owner-svn-src-projects@FreeBSD.ORG  Wed Mar 10 17:26:29 2010
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 D1A7E106566C;
	Wed, 10 Mar 2010 17:26:29 +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 C0D728FC1C;
	Wed, 10 Mar 2010 17:26: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 o2AHQTGp005059;
	Wed, 10 Mar 2010 17:26:29 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2AHQTPX005056;
	Wed, 10 Mar 2010 17:26:29 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <201003101726.o2AHQTPX005056@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Wed, 10 Mar 2010 17:26:29 +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: r204959 - in projects/clangbsd: gnu/usr.bin/cc/include
	usr.bin/clang/include
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: Wed, 10 Mar 2010 17:26:29 -0000

Author: rdivacky
Date: Wed Mar 10 17:26:29 2010
New Revision: 204959
URL: http://svn.freebsd.org/changeset/base/204959

Log:
  Install *intrin header files belonging to the compiler we are using.
  gcc ones when using gcc, clang ones when using clang`

Modified:
  projects/clangbsd/gnu/usr.bin/cc/include/Makefile
  projects/clangbsd/usr.bin/clang/include/Makefile

Modified: projects/clangbsd/gnu/usr.bin/cc/include/Makefile
==============================================================================
--- projects/clangbsd/gnu/usr.bin/cc/include/Makefile	Wed Mar 10 17:25:18 2010	(r204958)
+++ projects/clangbsd/gnu/usr.bin/cc/include/Makefile	Wed Mar 10 17:26:29 2010	(r204959)
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
 .include "../Makefile.inc"
+.include <bsd.own.mk>
 
 .PATH: ${GCCDIR}/config/${GCC_CPU}
 
+.if ${MK_CLANG_IS_CC} == "no"
 .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
 INCS=	emmintrin.h mmintrin.h pmmintrin.h xmmintrin.h mm_malloc.h
 .elif ${TARGET_ARCH} == "ia64"
@@ -13,6 +15,7 @@ INCS=	mmintrin.h
 .elif ${TARGET_ARCH} == "powerpc"
 INCS=	ppc-asm.h altivec.h spe.h
 .endif
+.endif
 
 mm_malloc.h: pmm_malloc.h
 	@rm -rf ${.TARGET}

Modified: projects/clangbsd/usr.bin/clang/include/Makefile
==============================================================================
--- projects/clangbsd/usr.bin/clang/include/Makefile	Wed Mar 10 17:25:18 2010	(r204958)
+++ projects/clangbsd/usr.bin/clang/include/Makefile	Wed Mar 10 17:26:29 2010	(r204959)
@@ -2,9 +2,11 @@
 
 .PATH: ${.CURDIR}/../../../contrib/llvm/tools/clang/lib/Headers
 
-INCSDIR=${INCLUDEDIR}/clang/1.0
+.include <bsd.own.mk>
 
+.if ${MK_CLANG_IS_CC} != "no"
 INCS=	emmintrin.h mm_malloc.h mmintrin.h pmmintrin.h tmmintrin.h xmmintrin.h
+.endif
 
 .include <bsd.init.mk>
 .include <bsd.incs.mk>