KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

OptionalObsoleteFiles.inc: fix up WITH_LLVM_LINK_STATIC_LIBRARIES cases

Browse Source 
In commit cf1eaaf41c 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:		cf1eaaf41c
MFC after:	1 week
This commit is contained in:
Dimitry Andric
2025-12-24 16:52:48 +01:00
parent 8d5a11cd01
commit 160077a4d7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/build/mk/OptionalObsoleteFiles.inc
+6 -6
View File
@@ -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