diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2025-12-24 15:52:48 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2025-12-24 15:52:48 +0000 |
| commit | 160077a4d75186a979f28f0778259c66d8cac8be (patch) | |
| tree | 7dcdee4f74a1499dc5f82383c89f4b9bd356c3de | |
| parent | 8d5a11cd0137d3ad70f6b06e063ea91a776d510a (diff) | |
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
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 12 |
1 files 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 |