From nobody Sat Jul 25 13:07:58 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 4h6lXH1vCGz6lNdh for ; Sat, 25 Jul 2026 13:07:59 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h6lXH069Fz3lpk for ; Sat, 25 Jul 2026 13:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784984879; 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=AhBNy93sANzGZvlcU1tJgHN2Icco2ylBmqUiH+RjNRQ=; b=IAKLM7rqY1dVXou+jOE3g6nZMK43zQhjZvqgpgRyeuF6wtP39KBJ/jyM8DRzuJg0PebS9W aiFwD2n3w+6KC56t2Lkx2pg3ckNJNSWB073egZVIk1AiEAgK/3BsUE8gsd9HdNvaHzreaD s0RpVvWKCvVE1nyIeABfwXNJUDekfO/O9AUmT236SQVbUn8zfMPqVNl1RqyhEKW5PFwsEo PKQLOZo83Jx0OscsX7mnSVxF1eOFfXZhRFpZb6rPWkDrrOrZeVqNqOSXUFWqn2NuJziCTC 0JNOcQCJyMqqumT27wkBvV/tuubzc62+7qdRHZKQXR2xnnTIpjjmb6FqM1IO9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784984879; a=rsa-sha256; cv=none; b=YYo5jsdupi51ufS2YfLYk2+2KRKbDjvtp3yPw5SZcMRGTkZi+hiaXMyfLsV9hMpNIN2/BC i95P/G4/ilS4qRLmDzlNCg/zwalCy5SQ+TQFcyTXA1fplskHpqYQnXn1TzLUHOB+e6nV0/ UliUeLxaKCLz3USCTw/sG77375XszAfvJilXgcRCUaaw4PI2Hp1Uoq8tlsuqO6Gt5R23Xh gwM6TJHHBrycRyMSGXcIXbdNeVrTTIIH7wYXS3MhuuIxAGJNRtN0oCvfMI67ijCi4PZBiv 7a5Y1HQZk8JCKIZZzqD2Il7GlmX26ouOZCJaKsTXyI82OS1m/Cd1mdL65lit4g== 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=1784984879; 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=AhBNy93sANzGZvlcU1tJgHN2Icco2ylBmqUiH+RjNRQ=; b=vaxil/5GzgIFrFcK2aOEW2d2SVvc81StSaLXstoEDJoxyh5nq4C9DNKczN55Ut/iGOJiNU a/DxphMBYidTVB/eEJTjBQBBG9TLuQzjRB2ZiZAXhRq2FeFVHZv1J+HzMD8LtbEDM12egh ZWB9LR7W0VRZ76QlOMigZdVTC/yO/rHct+SBeKkmK4wMYvePBYoIsN6+0NCPoWyZpODQvU MABEMm7Bws3MBQSPecTXXJ7jSucGjaZPaSUZ4vDbSA5sZqAnHIt+l3dNAO/GkCK2FApXNu 7ZuVAVN3MKZKzEBmdG+3ExXb0SIJWh87VdGLB35FPZqgpD9mN/xMUqjfIjdsOQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h6lXG62rczdfj for ; Sat, 25 Jul 2026 13:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27119 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Jul 2026 13:07:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 9b6e6b2923de - stable/15 - 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 9b6e6b2923de5702dbdb645a1d336641ece8acce Auto-Submitted: auto-generated Date: Sat, 25 Jul 2026 13:07:58 +0000 Message-Id: <6a64b52e.27119.284b571f@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=9b6e6b2923de5702dbdb645a1d336641ece8acce commit 9b6e6b2923de5702dbdb645a1d336641ece8acce Author: Lexi Winter AuthorDate: 2026-04-27 22:15:13 +0000 Commit: Lexi Winter 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