summaryrefslogtreecommitdiffstats
path: root/Makefile.inc1
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2017-01-06 22:09:00 +0000
committerdim <dim@FreeBSD.org>2017-01-06 22:09:00 +0000
commit1d1aa111885000c9d543e32d0ccd0b4766185756 (patch)
treed18059645f6bd6ce2a62ea644315e2624bb62feb /Makefile.inc1
parentd902b80bc6f2e222911f16d35214e6b2e06c4cdb (diff)
downloadFreeBSD-src-1d1aa111885000c9d543e32d0ccd0b4766185756.zip
FreeBSD-src-1d1aa111885000c9d543e32d0ccd0b4766185756.tar.gz
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
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc11
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index f221221..6d96cea 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -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} \
OpenPOWER on IntegriCloud