OptionalObsoleteFiles.inc: fix up WITH_LLVM_LINK_STATIC_LIBRARIES cases
In commitcf1eaaf41cI 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:cf1eaaf41cMFC after: 1 week
This commit is contained in:
@@ -892,14 +892,14 @@ OLD_FILES+=usr/share/man/man4/ccd.4.gz
|
|||||||
OLD_FILES+=usr/share/man/man8/ccdconfig.8.gz
|
OLD_FILES+=usr/share/man/man8/ccdconfig.8.gz
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_CLANG} == no && ${MK_CLANG_FORMAT} == no && ${MK_LLDB} == no && \
|
.if (${MK_CLANG} == no && ${MK_CLANG_FORMAT} == no && ${MK_LLDB} == no) || \
|
||||||
${MK_LLVM_LINK_STATIC_LIBRARIES} == no
|
${MK_LLVM_LINK_STATIC_LIBRARIES} != no
|
||||||
OLD_LIBS+=usr/lib/libprivateclang.so.19
|
OLD_LIBS+=usr/lib/libprivateclang.so.19
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_CLANG_EXTRAS} == no && ${MK_CLANG} == no && ${MK_LLDB} == no && \
|
.if (${MK_CLANG_EXTRAS} == no && ${MK_CLANG} == no && ${MK_LLDB} == no && \
|
||||||
${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no && \
|
${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no) || \
|
||||||
${MK_LLVM_LINK_STATIC_LIBRARIES} == no
|
${MK_LLVM_LINK_STATIC_LIBRARIES} != no
|
||||||
OLD_LIBS+=usr/lib/libprivatellvm.so.19
|
OLD_LIBS+=usr/lib/libprivatellvm.so.19
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
@@ -3870,7 +3870,7 @@ OLD_LIBS+=${DEBUG_LIB${LIBCOMPAT}_LIBS}
|
|||||||
OLD_FILES+=usr/bin/ld.lld
|
OLD_FILES+=usr/bin/ld.lld
|
||||||
.endif
|
.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
|
OLD_LIBS+=usr/lib/libprivatelldb.so.19
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user