The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=adc88b9c01b5d7a51c896091b291afbdae42b02a
commit adc88b9c01b5d7a51c896091b291afbdae42b02a Author: Ed Maste <[email protected]> AuthorDate: 2022-01-07 15:34:08 +0000 Commit: Ed Maste <[email protected]> CommitDate: 2022-01-07 20:23:55 +0000 Build libclang also if LLDB is enabled LLDB depends on libclang as it uses Clang as the expression parser. Previously setting WITHOUT_CLANG but leaving LLDB enabled (as default) resulted in a build failure. Users who set WITHOUT_CLANG in order to reduce build time or size might want to set WITHOUT_LLDB in addition to WITHOUT_CLANG, or use WITHOUT_TOOLCHAIN instead. PR: 260993 Reported by: eugen Reviewed by: dim MFC after: 3 days Sponsored by: The FreeBSD Foundation --- Makefile.inc1 | 3 ++- lib/clang/Makefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 2cc00beed80d..b31c1d09fbeb 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2343,7 +2343,8 @@ _gensnmptree= usr.sbin/bsnmpd/gensnmptree _clang_tblgen= \ lib/clang/libllvmminimal \ usr.bin/clang/llvm-tblgen -.if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_CLANG} != "no" +.if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_CLANG} != "no" || \ + ${MK_LLDB} != "no" _clang_tblgen+= usr.bin/clang/clang-tblgen .endif .if ${MK_LLDB} != "no" diff --git a/lib/clang/Makefile b/lib/clang/Makefile index df4aa01a2653..cbb2c2a7175f 100644 --- a/lib/clang/Makefile +++ b/lib/clang/Makefile @@ -4,7 +4,7 @@ # These have to be built in order. SUBDIR= libllvm -.if ${MK_CLANG} != "no" +.if ${MK_CLANG} != "no" || ${MK_LLDB} != "no" SUBDIR+= libclang SUBDIR+= headers .endif
