git: 7c6a0ba19de4 - stable/15 - OptionalObsoleteFiles.inc: fix up WITH_LLVM_LINK_STATIC_LIBRARIES cases

The branch stable/15 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=7c6a0ba19de410b54c3e853c692d3df0d8636538

commit 7c6a0ba19de410b54c3e853c692d3df0d8636538
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2025-12-24 15:52:48 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
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