mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-03 07:04:53 +00:00
native-xtools: avoid libllvm while populating the sysroot
Prior to021385aba5
, MK_CLANG=no was sufficient to avoid descending into lib/clang, but the referenced change added a couple of other enabling knobs. Turn those off, too, to continue avoiding libllvm. With this change, we no longer end up with a libllvm using the wrong default target triple; `poudriere jail -cx` works once again. Reported by: bhughes, imp, probably others Fixes:021385aba5
("Add WITH_LLVM_BINUTILS to install LLVM ...") (cherry picked from commite2e2c622c3
)
This commit is contained in:
parent
20feb7838d
commit
3afe1c2e18
|
@ -2807,6 +2807,10 @@ NXBMAKEARGS+= \
|
|||
NXBMAKEENV+= \
|
||||
MAKEOBJDIRPREFIX=
|
||||
|
||||
# This should match all of the knobs in lib/Makefile that it takes to avoid
|
||||
# descending into lib/clang!
|
||||
NXBTNOTOOLS= MK_CLANG=no MK_LLD=no MK_LLDB=no MK_LLVM_BINUTILS=no
|
||||
|
||||
.if make(native-xtools*) && \
|
||||
(!defined(NXB_TARGET) || !defined(NXB_TARGET_ARCH))
|
||||
.error Missing NXB_TARGET / NXB_TARGET_ARCH
|
||||
|
@ -2846,11 +2850,11 @@ native-xtools: .PHONY
|
|||
# Populate includes/libraries sysroot that produce native binaries.
|
||||
# This is split out from 'toolchain' above mostly so that target LLVM
|
||||
# libraries have a proper LLVM_DEFAULT_TARGET_TRIPLE without
|
||||
# polluting the cross-compiler build. The LLVM/GCC libs are skipped
|
||||
# polluting the cross-compiler build. The LLVM libs are skipped
|
||||
# here to avoid the problem but are kept in 'toolchain' so that
|
||||
# needed build tools are built.
|
||||
${_+_}cd ${.CURDIR}; ${NXBTMAKE} _includes MK_CLANG=no
|
||||
${_+_}cd ${.CURDIR}; ${NXBTMAKE} _libraries MK_CLANG=no
|
||||
${_+_}cd ${.CURDIR}; ${NXBTMAKE} _includes ${NXBTNOTOOLS}
|
||||
${_+_}cd ${.CURDIR}; ${NXBTMAKE} _libraries ${NXBTNOTOOLS}
|
||||
.if !defined(NO_OBJWALK)
|
||||
${_+_}cd ${.CURDIR}; ${NXBMAKE} _obj
|
||||
.endif
|
||||
|
|
Loading…
Reference in a new issue