svn commit: r295723 - in projects/mips64-clang: sys/boot/mips usr.bin

[Sean Bruno]

Author: sbruno
Date: Wed Feb 17 22:52:58 2016
New Revision: 295723
URL: https://svnweb.freebsd.org/changeset/base/295723

Log:
  Disable the beri bits for clang enabled mips64 builds.
  
  Disable xlint for clang enabled mips64 builds.

Modified:
  projects/mips64-clang/sys/boot/mips/Makefile
  projects/mips64-clang/usr.bin/Makefile

Modified: projects/mips64-clang/sys/boot/mips/Makefile
==============================================================================
--- projects/mips64-clang/sys/boot/mips/Makefile	Wed Feb 17 22:52:11 2016	(r295722)
+++ projects/mips64-clang/sys/boot/mips/Makefile	Wed Feb 17 22:52:58 2016	(r295723)
@@ -1,12 +1,15 @@
 # $FreeBSD$
+.include <src.opts.mk>
 
 #
 # The BERI boot loader port works only on 64-bit MIPS; not a hard port to
 # 32-bit if someone is interested.  Build on all 64-bit MIPS platforms to
 # ensure it gets adequate build-test coverage.
 #
-.if ${MACHINE_ARCH} == "mips64"
+.if ${MACHINE_ARCH} == "mips64" 
+.if ${COMPILER_TYPE} == "gcc"
 SUBDIR=	beri
 .endif
+.endif
 
 .include <bsd.subdir.mk>

Modified: projects/mips64-clang/usr.bin/Makefile
==============================================================================
--- projects/mips64-clang/usr.bin/Makefile	Wed Feb 17 22:52:11 2016	(r295722)
+++ projects/mips64-clang/usr.bin/Makefile	Wed Feb 17 22:52:58 2016	(r295723)
@@ -281,7 +281,8 @@ SUBDIR.${MK_TOOLCHAIN}+=	rpcgen
 SUBDIR.${MK_TOOLCHAIN}+=	unifdef
 SUBDIR.${MK_TOOLCHAIN}+=	size
 SUBDIR.${MK_TOOLCHAIN}+=	strings
-.if ${MACHINE_ARCH} != "aarch64" # ARM64TODO xlint does not build
+.if ${MACHINE_ARCH} != "aarch64" && \ # ARM64TODO xlint does not build
+    (${MACHINE_ARCH} == "mips64" && ${COMPILER_TYPE} == "gcc") # mips64 clang doesn't build this yet
 SUBDIR.${MK_TOOLCHAIN}+=	xlint
 .endif
 SUBDIR.${MK_TOOLCHAIN}+=	xstr