From nobody Wed Dec 24 15:57:11 2025 X-Original-To: dev-commits-src-main@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 4dbxMr3F2Lz6LBdH for ; Wed, 24 Dec 2025 15:57:12 +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 4dbxMq75k0z3tCN for ; Wed, 24 Dec 2025 15:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766591832; 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=qjaDP+XQLlRi+NeGmsEfuyiQgCPWPHuZYzHL9Igz8qA=; b=j9x74OtzdQ6E53zvJb8cib7rC+3a6wSKpfXFtpJHcrtC7JZW0YOJz5oFQfsdyK53j2NR/x FatUUVBR9Z3i/tDqhHEV/F5Up28DpARN6tJ/IrsNgIvGANQM5wXRD8x+QHviKlhagmeN31 7OCVImI5v733lXUfKR9gB1dqN1EKacBtuLDlLqHLpVmeoxIHbDURrwtIAjkyZFT/30/0Vx g7+cnibF6VJc/9pba5TrcdfxbXddodSY0ljSH6ww94mi8fWkW5TvP7kXMWCoGjMiRuUv2W C++35XIyb0j/mfrrQgM4awJyR1OdxnOYCfTQLuzAbU4E/oXIJKWjqPuIMSanOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766591832; 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=qjaDP+XQLlRi+NeGmsEfuyiQgCPWPHuZYzHL9Igz8qA=; b=sTAfvSUfhJYetKlAaVI42qa3coKFAfzqK6sLE0QdTqZ0yyijcqsdxr1rZxJ7KaBLfWAOTC n7WlKQ5wvTG5BAkXIg1DxYAivyNdLne38xOcHw/ZHkWQWEWZoy97p7GdRBpjKdds2eaJVi 8wnsWkhmKmp7d9ENWC1iGbppmHJSZf7d+kJQBbHrgfzMN6IMQcAoL1/nWQS0EPaDmdSYUg zU53ud/R0OgQE/9I0QEG1L1OJQhx/c+hwxA/7QbYepzwoSlQWgh0Dlhm5KbkTgf3ZICbwi hmMM128s1hwH9b+kCSteztVl8azs9t1LoLQ7ywJmvu35CRt1b6FElOVf1Wu1ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766591832; a=rsa-sha256; cv=none; b=ctPl4KuuAgfuW2tas3NHUx1cCT8IZI6+eB7RvWKJnb5FEGuvRc/44ft1ipjsgKDc37dgwX Gkboiu/5hsPl02mh0TtjpGmfCmLsr8Zf9c2BVfbTsZJJE8Tl4rHgMAch9QBv7v28xqIhz3 CuyLs2Fr8bqPuv6t3+hyJcn/7keRzoKFDbIi6Qc3iqrSTiZYvWBFlgM+pm6F8QTg6xPduc AlF7dmsAlXRooZtaGmY4434I6sFmNiF/xNIZ+3PgVWyyUgnvjW0YQVqKYWIoJVUFgUkx/y t5UgTEj1O57a02/MHTyFW0q75Hgtiem6kdlBV53WWTBRexdO5S4BcyaX3MNIGw== 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 4dbxMq5qKwzpj7 for ; Wed, 24 Dec 2025 15:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a81d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 15:57:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 160077a4d751 - main - OptionalObsoleteFiles.inc: fix up WITH_LLVM_LINK_STATIC_LIBRARIES cases List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 160077a4d75186a979f28f0778259c66d8cac8be Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 15:57:11 +0000 Message-Id: <694c0d57.a81d.7eb74ea3@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=160077a4d75186a979f28f0778259c66d8cac8be commit 160077a4d75186a979f28f0778259c66d8cac8be Author: Dimitry Andric AuthorDate: 2025-12-24 15:52:48 +0000 Commit: Dimitry Andric CommitDate: 2025-12-24 15:52:48 +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 --- 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 f86e9d0dc192..a7ae52650999 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 @@ -3870,7 +3870,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