From owner-svn-src-head@freebsd.org  Mon Jan  2 19:33:24 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 2A19CC9C6A4;
 Mon,  2 Jan 2017 19:33:24 +0000 (UTC) (envelope-from dim@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 EE14B15C1;
 Mon,  2 Jan 2017 19:33:23 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v02JXNXI058639;
 Mon, 2 Jan 2017 19:33:23 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v02JXNc7058638;
 Mon, 2 Jan 2017 19:33:23 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201701021933.v02JXNc7058638@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 2 Jan 2017 19:33:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r311131 - head
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jan 2017 19:33:24 -0000

Author: dim
Date: Mon Jan  2 19:33:22 2017
New Revision: 311131
URL: https://svnweb.freebsd.org/changeset/base/311131

Log:
  Make native-xtools build correctly after clang/llvm 3.9.0 import
  
  During the clang/llvm 3.9.0 import, the build structure for it was
  completely revamped.  This broke the native-xtools target.
  
  It first attempts to build libllvmminimal, then the llvm-tblgen and
  clang-tblgen executables, but these fail to link because they are linked
  to the 'full' libllvm by default, as they normally are during the
  'world' stage.
  
  To make these link against libllvmminimal instead, define TOOLS_PREFIX,
  similarly as during the bootstrap-tools phase.  The value itself is
  empty, as we don't really want to use a prefix.
  
  Reviewed by:	imp
  PR:		215684
  MFC after:	3 days
  Differential Revision:	https://reviews.freebsd.org/D9026

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Mon Jan  2 19:26:39 2017	(r311130)
+++ head/Makefile.inc1	Mon Jan  2 19:33:22 2017	(r311131)
@@ -1867,6 +1867,7 @@ cross-tools: .MAKE .PHONY
 
 NXBDESTDIR=	${OBJTREE}/nxb-bin
 NXBENV=		MAKEOBJDIRPREFIX=${OBJTREE}/nxb \
+		TOOLS_PREFIX= \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${PATH}:${OBJTREE}/gperf_for_gcc/usr/bin
 NXBMAKE=	${NXBENV} ${MAKE} \