Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 10 Mar 2010 17:26:29 +0000 (UTC)
From:      Roman Divacky <rdivacky@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r204959 - in projects/clangbsd: gnu/usr.bin/cc/include usr.bin/clang/include
Message-ID:  <201003101726.o2AHQTPX005056@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003101726.o2AHQTPX005056>