From nobody Fri Jan 2 20:51:47 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 4djbTc3YMfz6MFCC for ; Fri, 02 Jan 2026 20:51:48 +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 4djbTb6lDCz3qCC for ; Fri, 02 Jan 2026 20:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387108; 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=egSu/i6K4w3B3h5V7QhObzq6TnV1OPe7T24w5l+peio=; b=VWMKHfM/Bq1mrf+nT1uGr0eDfgW36nMmOf2+ttOpJPUPPUhTGohOi3BrAyod8mQAsc/1/1 qWrQbad7nPyO/d5I21dI4/HKtoX4feIDuWJGt6IGjns13w72ReRBsCAc8EUrxYbTr92w7l 8AWJe/was7ut2dB71pZYa9RWhI6TKKDkuAWD4ZdYnTqcKb+tV6O/yqzjjCSAh9iTh0WmLm 7U9FnITCmYsPu0v+IV+3wSvuc5lMBggv4FEQzHd/BbTw7cxmIwueWvJvBYibfxkcBlgYBW Zd0zmpUAWKiEI3H0Xu7kZXIHb4lZrFzjYsRjL50Zpbu2h357golMX5kV8hBi6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387108; 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=egSu/i6K4w3B3h5V7QhObzq6TnV1OPe7T24w5l+peio=; b=cElwW91iJ4T2mXO+YV3gR22rq1EMP0bCNoWpMJndNfMG123V3lsJ+SYWdbdacYrW55vRdc 0NMnr6dd0/fCbMu6gRccYCH4QU2fUIPTuxduhG2AhrDgmahBRPFYa4AzFnxfZPGGRBuv4Q 8Rp1+q8GC5VC2N7ZslE2dTEOIZSCy78n226SzA4Q81vWO6pukyLo2uRPkgjkAWzKEHoX42 aiZgCWA8naRMGjaLBc0pevg4liaEA0Dnu2UDqXHSkyt8KfiP9PQ6Qt/33cKt1xN/0AYbJe 8CN8lE6TW0fz3R3KDSsuRmDwNJT+L+L5i74zVJcUzoPLhXQTOwSgh9KUEtNS6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387108; a=rsa-sha256; cv=none; b=WF7Hmp8amKWDhp1IlbR2fsdIgObaXmgo8lZQi0F3LN9oQ+COHyrNx1p25fNE7aoFFOSfB/ ejtddR0zmfhMNyEGi5q4ktaEG7nNEP+/kKR2tVfZRRO8sPzHvULcRUiDyS+4m8HfzPqXqz 2voXBLzZ/WivEOyNnXzsQyRNqiDTm+EsQl3pB5Vki6aPXKBSr7AeGwTOajjthM3cY79+M1 U8YLcqq9JW6l2xfmc+GFA9Nokq0eQdqOI9tTC2eRNnpLnisgSB4SbgbyarDguqftfzi31E iNKTjH5RianMzjnjxzNadQSLb1Ot1lAs3RWT2lTPNFsybXQNVkw77gUlZZGx1A== 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 4djbTb6GzpzbDZ for ; Fri, 02 Jan 2026 20:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a2e1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:51:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 7c6a0ba19de4 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 7c6a0ba19de410b54c3e853c692d3df0d8636538 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:51:47 +0000 Message-Id: <69582fe3.a2e1.60c5eede@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=7c6a0ba19de410b54c3e853c692d3df0d8636538 commit 7c6a0ba19de410b54c3e853c692d3df0d8636538 Author: Dimitry Andric AuthorDate: 2025-12-24 15:52:48 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:40:31 +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 f91651fd235b..d7131d01ef37 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -892,14 +892,14 @@ OLD_FILES+=usr/share/man/man4/ccd.4.gz OLD_FILES+=usr/share/man/man8/ccdconfig.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 @@ -3866,7 +3866,7 @@ OLD_LIBS+=${DEBUG_LIB${LIBCOMPAT}_LIBS} 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