Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 27 Apr 2026 22:20:01 +0000
From:      Lexi Winter <ivy@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: e6d112bbbbf0 - main - packages: Fix clang conditional
Message-ID:  <69efe111.199da.78866c04@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by ivy:

URL: https://cgit.FreeBSD.org/src/commit/?id=e6d112bbbbf0b09f0f18a85a0a3c6d5a49aff653

commit e6d112bbbbf0b09f0f18a85a0a3c6d5a49aff653
Author:     Lexi Winter <ivy@FreeBSD.org>
AuthorDate: 2026-04-27 22:15:13 +0000
Commit:     Lexi Winter <ivy@FreeBSD.org>
CommitDate: 2026-04-27 22:15:13 +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
---
 packages/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/Makefile b/packages/Makefile
index 3c189770dac5..79bdab9f1abd 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
 


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69efe111.199da.78866c04>