From nobody Mon Apr 27 22:20:01 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g4J0R311Xz6Zm1c for ; Mon, 27 Apr 2026 22:20:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g4J0R0XfKz3m8S for ; Mon, 27 Apr 2026 22:20:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777328407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FghSekl5BFFf819j15UB+rd8Qvz1GzklqSxstdIrRXE=; b=mdLDe400h8vXJr36XPJ7XNgh2PmAROHxXdi2ndpGr8AcDR0OFvDyLkFkpfV5gTIlVCFsRB UHx16vPvkvS/q1qkcccJEr+uwCa9g+LnayHIEMxZVPOzoM3TzQtKqdmTf7qRROtPnkpd4y qqgcszvQTC+1uCpOgmVWhNdVxwkqMYBzB6us6QcJJxRethAAs1YJYN1EjtXij4woX4TkIW Hg04AI7qg1S84oqsUSoFE5I4E66SWPdRU3G8TyKKVtZUL21TuG2nMuVQKRKq2ZcsPan56n slEFXtUKSsLJVWlP3O7ZfwuAMad7FDuPQpFeYaOUbVnbljSSmnRUsL59+BHV9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777328407; a=rsa-sha256; cv=none; b=bFcic0OCk35/pZlOeGxuuM14MPsMo0crXtvTiQdMIq11cvJmkGSbK0Kaz1COGO1yem0+8g 4Yk3dfznafNyQ9rPFFnJF8dLzwn1LxdXOWlhq+NsMa0Lbc95Y0h7jMU2mXA4NGlGXP46tr WG091D4BEUQbcapfThyZvrQihI052xsZ/ZeBZ1r1pfzIJNCvlSYYP5vw5H1UdWh12Qk2M8 g0nIB+7qbP8BFQvUHZy8r8HL3gcwPiQyz7OyCxmVhFJEuYk/oPY1p14GOiueWSnx5E9qPk p1ziJhTeP7KX2ePWm6vSVFzqAqfTWL285Vq3GHxXKZ+bVPOFndhIk12I6vigRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777328407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FghSekl5BFFf819j15UB+rd8Qvz1GzklqSxstdIrRXE=; b=gGWVBIU7J5cpPIRsdMpjidksJY23oF5ziS1LhEwR6/TamsHxfJOIU+4uFxumqJipNI1Zbb QGVPf06oDrTix73HWycQzJwy8JnOjLOWV6yjpYXGu9jBrNHZmxihJtXGag7WcJM2rtK1Xh f3Kz6mGHxQULGo7aMBs7TderH/p5kceOWka4E1XEgwfHA4PQ78f4pmrSLIUaIY/SdebteQ FeGee9jX1hFVkAgpqblRnsRTYWh0BRf0IXoCZcM+k+l9gynkXgoxVEt4d7IYQNuvCvW1Ld acwX5QpKx6HYW3BSpIRXmDWYD+dh21AHHNw5niUIfT+uKuFSdJrtfMjhUNacvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g4J0Q5lf1z9yj for ; Mon, 27 Apr 2026 22:20:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 199da by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Apr 2026 22:20:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: e6d112bbbbf0 - main - packages: Fix clang conditional List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6d112bbbbf0b09f0f18a85a0a3c6d5a49aff653 Auto-Submitted: auto-generated Date: Mon, 27 Apr 2026 22:20:01 +0000 Message-Id: <69efe111.199da.78866c04@gitrepo.freebsd.org> The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=e6d112bbbbf0b09f0f18a85a0a3c6d5a49aff653 commit e6d112bbbbf0b09f0f18a85a0a3c6d5a49aff653 Author: Lexi Winter AuthorDate: 2026-04-27 22:15:13 +0000 Commit: Lexi Winter 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