The branch stable/13 has been updated by arichardson:
URL:
https://cgit.FreeBSD.org/src/commit/?id=b7440d235e5d5abba30d67fc59d822b190e6d267
commit b7440d235e5d5abba30d67fc59d822b190e6d267
Author: Alex Richardson <arichard...@freebsd.org>
AuthorDate: 2021-07-05 17:36:02 +0000
Commit: Alex Richardson <arichard...@freebsd.org>
CommitDate: 2021-08-05 09:00:28 +0000
Don't build lldb-tablegen if MK_LLDB=no
Split out from D31060.
Reviewed by: emaste
(cherry picked from commit c5d1d88a351abe869c436f4f70c85d4c29e6e98c)
---
Makefile.inc1 | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index a595dfbb76c9..ebc0733de857 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2325,14 +2325,17 @@ _gensnmptree= usr.sbin/bsnmpd/gensnmptree
# We need to build tblgen when we're building clang or lld, either as
# bootstrap tools, or as the part of the normal build.
.if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_CLANG} != "no" || \
- ${MK_LLD_BOOTSTRAP} != "no" || ${MK_LLD} != "no"
+ ${MK_LLD_BOOTSTRAP} != "no" || ${MK_LLD} != "no" || \
+ ${MK_LLDB} != "no"
_clang_tblgen= \
lib/clang/libllvmminimal \
- usr.bin/clang/llvm-tblgen \
- usr.bin/clang/clang-tblgen \
- usr.bin/clang/lldb-tblgen
-# XXX: lldb-tblgen is not needed, if top-level MK_LLDB=no
-
+ usr.bin/clang/llvm-tblgen
+.if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_CLANG} != "no"
+_clang_tblgen+= usr.bin/clang/clang-tblgen
+.endif
+.if ${MK_LLDB} != "no"
+_clang_tblgen+= usr.bin/clang/lldb-tblgen
+.endif
${_bt}-usr.bin/clang/clang-tblgen: ${_bt}-lib/clang/libllvmminimal
${_bt}-usr.bin/clang/llvm-tblgen: ${_bt}-lib/clang/libllvmminimal
${_bt}-usr.bin/clang/lldb-tblgen: ${_bt}-lib/clang/libllvmminimal
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
