hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-14 22:32:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bootstrapping to actually build lldb-tblgen for later use

Browse Source 
Because MK_LLDB=no is in BSARGS, the bootstrap-tools recursive make does
not add lldb-tblgen to _clang_tblgen, causing it to not be built. This
means that the build currently always uses the host's lldb-tblgen
(which, whilst currently it appears to work, could in future break if
TableGen backends are added or altered) and, if it doesn't exist (either
because the current FreeBSD system was built with it disabled, or you're
building on macOS/Linux), fails. Linux and macOS cross-builds used to
work simply because LLDB was previously in BROKEN_OPTIONS when building
on non-FreeBSD.

Instead, move MK_LLDB=no from BSARGS to XMAKE. This ensures that the
lib/clang build in cross-tools continues to not build LLDB parts for the
bootstrap toolchain (both to save time/space on FreeBSD, and because our
vendored LLDB does not include the macOS and Linux host files so those
would fail to build).

The DIRDEPS target is updated to move MK_LLDB=no from the BSARGS block
that mirrors Makefile.inc1 to the line that disables additional
toolchain components. The DIRDEPS build likely suffers from the same
issue currently, but having never used it and not being familiar with
how it works I am leaving that as-is. If it does suffer from the same
issue it should be easily reproducible by renaming /usr/bin/lldb-tblgen
or moving it to a directory not in PATH.

Fixes:		31ba4ce889 ("Allow bootstrapping llvm-tblgen on macOS and Linux")
MFC after:	1 week
Reviewed by:	dim, emaste, imp
Differential Revision:	https://reviews.freebsd.org/D31531
This commit is contained in:
Jessica Clarke 2021-08-24 14:59:04 +01:00
parent ab3a18095f
commit 1e4c802913
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.inc1
View File

@ -727,7 +727,6 @@ BSARGS= DESTDIR= \
MK_CLANG_FORMAT=no \
MK_CLANG_FULL=no \
MK_HTML=no \
MK_LLDB=no \
MK_MAN=no \
MK_PROFILE=no \
MK_RETPOLINE=no \
@ -771,6 +770,7 @@ TMAKE= \
XMAKE= ${BMAKE} \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
MK_CLANG_IS_CC=${MK_CLANG_BOOTSTRAP} \
MK_LLDB=no \
MK_TESTS=no
# kernel-tools stage

3
targets/pseudo/bootstrap-tools/Makefile
View File

@ -48,7 +48,6 @@ BSARGS= DESTDIR= \
MK_CLANG_FORMAT=no \
MK_CLANG_FULL=no \
MK_HTML=no \
MK_LLDB=no \
MK_MAN=no \
MK_PROFILE=no \
MK_RETPOLINE=no \
@ -59,7 +58,7 @@ BSARGS= DESTDIR= \
MK_MAN_UTILS=yes
# We will handle building the toolchain and cross-compiler.
BSARGS+= MK_CROSS_COMPILER=no MK_CLANG=no
BSARGS+= MK_CROSS_COMPILER=no MK_CLANG=no MK_LLDB=no
DISTRIB_ENV= INSTALL="sh ${SRCTOP}/tools/install.sh" NO_FSCHG=1 MK_TESTS=no
legacy: .MAKE ${META_DEPS}