From owner-svn-src-projects@freebsd.org  Wed Feb 17 22:52:59 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7C82EAAA9B3
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed, 17 Feb 2016 22:52:59 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4C95F13D9;
 Wed, 17 Feb 2016 22:52:59 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1HMqwEU098872;
 Wed, 17 Feb 2016 22:52:58 GMT (envelope-from sbruno@FreeBSD.org)
Received: (from sbruno@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1HMqw9B098870;
 Wed, 17 Feb 2016 22:52:58 GMT (envelope-from sbruno@FreeBSD.org)
Message-Id: <201602172252.u1HMqw9B098870@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sbruno set sender to
 sbruno@FreeBSD.org using -f
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Wed, 17 Feb 2016 22:52:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295723 - in projects/mips64-clang: sys/boot/mips usr.bin
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Feb 2016 22:52:59 -0000

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