From nobody Fri Jan 2 20:52:27 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 4djbVN0fNFz6MFhN for ; Fri, 02 Jan 2026 20:52:28 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbVM64cQz3r5r for ; Fri, 02 Jan 2026 20:52:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387147; 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=OFgkSQXcUP2iEv/854h5kifVzCOOJj1X2lphLNXau4o=; b=oDPkl0gOegXr5ShtGq/e9L3hYQB2uPGTdLq7G7DFz1YRUXv5dVEYRW23PYWEJ2XhaZH95p XCZdTaK1AhL14h+uMu46ZNmclfQntgjab0U3MhEnjbL1OCr2hKZ0DVRNykysYPKSl+Vjpo toE3fwGZYFNUuA4oN4QxeUfv3KbDKFFw7qpiyQA9aldoqf75XjtygtszhBfXQ5V+YmDo+1 kc5Weywo52N9UMYpR+u5Os0Qy87BUJAuT+q4gk+nREJffTfR8f43uXoJGSXZsIYP6mB1vb zyE8JJA17ENqH/qLri1qDeCPoOKUZuYoTFKIxekRQ7rPc6HGpdhMxnUankPDBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387147; 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=OFgkSQXcUP2iEv/854h5kifVzCOOJj1X2lphLNXau4o=; b=wj4GADiAhgWwO8BItmO5v6caaQe3e72v3v6FEq8dzzrrnH8H2518S9ayYvej8adgGToIgn PnJ/Xn+rUttJ2qBlFOUtlxa9qoZE6Sb/z1fEi4stXE7INojBshw0sQ09gftsA0t1WimCs0 vsm7okiWL+I8t5kLD0zIzaX/McD1A/PQ4uzytRjG6UsULSxhv0cchyAxoEm4ED4j9VLH3g gDePZF14sEout855vZuZJ6mt6Uuka2E3KplQ6pfEqsVLzQ85cdfqvAmIWMMuLQsMzL/pwZ itVmbO7tw1hR/gdkNlGu1VOO90/nXu77HvfNwTf4ffXcRod7jvcH2TPPXlVjfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387147; a=rsa-sha256; cv=none; b=eaaY7UEMeqHsdILHw+hA1EU4aAJa7lRETgaUg+gdpL3K6oLpThKwQ9o1HTlVFrzNV6jSlu i/A28ABhQUveNZv5UKqM3el2huU4BpWBP8MOBqgs7Plf69mjjfR0+H2m+3rOpajSayd4qv 88yLg0ZCJb+9tQAPLyV0WQkwgcEnKpNiGp7V2d7f1RzCXiYDjhwKNqzkMZLQuJbg5hRayW Po86XsVzIPH8qrU5t9bDa6aXKsOPz2ckracAXpG/rWXueawwspkisodUxKiNw3cdosLDHF Ts9Ym4OkbzS0mx2A1CGTuISwEGgEYWN/gPWPcjpnhFXm/ugOdNOAhLOXVMAKNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbVM5h70zb3F for ; Fri, 02 Jan 2026 20:52:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a953 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:52:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: d3a575622839 - stable/13 - OptionalObsoleteFiles.inc: fix up WITH_LLVM_LINK_STATIC_LIBRARIES cases 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d3a575622839c1998354dab202f0ca53216e41a8 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:52:27 +0000 Message-Id: <6958300b.a953.4d0fe580@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=d3a575622839c1998354dab202f0ca53216e41a8 commit d3a575622839c1998354dab202f0ca53216e41a8 Author: Dimitry Andric AuthorDate: 2025-12-24 15:52:48 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:49:35 +0000 OptionalObsoleteFiles.inc: fix up WITH_LLVM_LINK_STATIC_LIBRARIES cases In commit cf1eaaf41cef I added the WITH_LLVM_LINK_STATIC_LIBRARIES src.conf(5) build knob, which also affects OptionalObsoleteFiles.inc. However, the checks were incorrect: when WITH_LLVM_LINK_STATIC_LIBRARIES is active, the OLD_LIBS libprivatellvm.so.19, libprivateclang.so.19 and libprivatelldb.so.19 should always be cleaned up. Fixes: cf1eaaf41cef MFC after: 1 week (cherry picked from commit 160077a4d75186a979f28f0778259c66d8cac8be) --- tools/build/mk/OptionalObsoleteFiles.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 2c07c61011e3..5e5d83456ce3 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1157,14 +1157,14 @@ OLD_FILES+=usr/share/man/man8/zfsloader.8.gz OLD_FILES+=usr/share/man/man8/zpool.8.gz .endif -.if ${MK_CLANG} == no && ${MK_CLANG_FORMAT} == no && ${MK_LLDB} == no && \ - ${MK_LLVM_LINK_STATIC_LIBRARIES} == no +.if (${MK_CLANG} == no && ${MK_CLANG_FORMAT} == no && ${MK_LLDB} == no) || \ + ${MK_LLVM_LINK_STATIC_LIBRARIES} != no OLD_LIBS+=usr/lib/libprivateclang.so.19 .endif -.if ${MK_CLANG_EXTRAS} == no && ${MK_CLANG} == no && ${MK_LLDB} == no && \ - ${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no && \ - ${MK_LLVM_LINK_STATIC_LIBRARIES} == no +.if (${MK_CLANG_EXTRAS} == no && ${MK_CLANG} == no && ${MK_LLDB} == no && \ + ${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no) || \ + ${MK_LLVM_LINK_STATIC_LIBRARIES} != no OLD_LIBS+=usr/lib/libprivatellvm.so.19 .endif @@ -4329,7 +4329,7 @@ OLD_DIRS+=usr/include/c++/v1 OLD_FILES+=usr/bin/ld.lld .endif -.if ${MK_LLDB} == no && ${MK_LLVM_LINK_STATIC_LIBRARIES} == no +.if ${MK_LLDB} == no || ${MK_LLVM_LINK_STATIC_LIBRARIES} != no OLD_LIBS+=usr/lib/libprivatelldb.so.19 .endif