From e6d112bbbbf0b09f0f18a85a0a3c6d5a49aff653 Mon Sep 17 00:00:00 2001 From: Lexi Winter Date: Mon, 27 Apr 2026 23:15:13 +0100 Subject: [PATCH] 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 --- packages/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/Makefile b/packages/Makefile index 3c189770dac..79bdab9f1ab 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