From owner-svn-src-stable-11@freebsd.org  Fri Jan  6 22:09:01 2017
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@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 76221CA3FF3;
 Fri,  6 Jan 2017 22:09:01 +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 4233C1FBA;
 Fri,  6 Jan 2017 22:09:01 +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 v06M90W9014721;
 Fri, 6 Jan 2017 22:09:00 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v06M90eq014720;
 Fri, 6 Jan 2017 22:09:00 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201701062209.v06M90eq014720@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: Fri, 6 Jan 2017 22:09:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r311558 - stable/11
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Jan 2017 22:09:01 -0000

Author: dim
Date: Fri Jan  6 22:09:00 2017
New Revision: 311558
URL: https://svnweb.freebsd.org/changeset/base/311558

Log:
  MFC r311131:
  
  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
  Differential Revision:	https://reviews.freebsd.org/D9026

Modified:
  stable/11/Makefile.inc1
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/Makefile.inc1
==============================================================================
--- stable/11/Makefile.inc1	Fri Jan  6 22:03:36 2017	(r311557)
+++ stable/11/Makefile.inc1	Fri Jan  6 22:09:00 2017	(r311558)
@@ -1839,6 +1839,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} \