svn commit: r311131 - head
Dimitry Andric
dim at FreeBSD.org
Mon Jan 2 19:33:24 UTC 2017
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} \
More information about the svn-src-all
mailing list