git: 9b6e6b2923de - stable/15 - packages: Fix clang conditional
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 25 Jul 2026 13:07:58 UTC
The branch stable/15 has been updated by ivy:
URL: https://cgit.FreeBSD.org/src/commit/?id=9b6e6b2923de5702dbdb645a1d336641ece8acce
commit 9b6e6b2923de5702dbdb645a1d336641ece8acce
Author: Lexi Winter <ivy@FreeBSD.org>
AuthorDate: 2026-04-27 22:15:13 +0000
Commit: Lexi Winter <ivy@FreeBSD.org>
CommitDate: 2026-07-25 13:01:23 +0000
packages: Fix clang conditional
Various src.conf options can cause us to build something that ends up
in the clang package, but MK_TOOLCHAIN is not one of them; copy the
proper conditional from lib/Makefile to decide if we need to build
the package.
This fixes the build when LLVM/clang is entirely disabled.
Fixes: bb75b0d581f7 ("packages: Convert world to a subdir build")
MFC after: 2 weeks
Reviewed by: emaste
Sponsored by: https://www.patreon.com/bsdivy
Differential Revision: https://reviews.freebsd.org/D56657
(cherry picked from commit e6d112bbbbf0b09f0f18a85a0a3c6d5a49aff653)
---
packages/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/packages/Makefile b/packages/Makefile
index 269ea2a07649..2c5bcdce1032 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -80,7 +80,8 @@ SUBDIR= blocklist \
SUBDIR+= acct
.endif
-.if ${MK_CLANG} != "no" || ${MK_TOOLCHAIN} != "no"
+.if ${MK_CLANG} != "no" || ${MK_LLD} != "no" || \
+ ${MK_LLDB} != "no" || ${MK_LLVM_BINUTILS} != "no"
SUBDIR+= clang
.endif