devel/llvm-{cheri,morello}: add a STATIC_LIBS option

When enabled assorted LLVM componant static libraries are included in
the package.  Unlike mainstream LLVM ports I've disabled this by
default as the libraries are of limited use here.

Sponsored by:	DARPA

3 files changed, 299 insertions, 294 deletions

diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile
index 191739defc9c..32f7a86b8d6e 100644
--- a/devel/llvm-cheri/Makefile
+++ b/devel/llvm-cheri/Makefile
@@ -69,7 +69,7 @@ GH_TAGNAME=	${LLVM_COMMIT}
 .sinclude "${.PARSEDIR}/Makefile.snapshot"
 .endif
 
-OPTIONS_DEFINE=	CLANG DOCS LIT LLD
+OPTIONS_DEFINE=	CLANG DOCS LIT LLD STATIC_LIBS
 OPTIONS_DEFAULT=	CLANG LIT LLD
 OPTIONS_SUB=	yes
 
@@ -91,6 +91,7 @@ LLD_DESC=		Install lld linker
 LLD_PORTDOCS=		lld
 LLDB_DESC=		Install lldb, the LLVM debugger
 LLDB_BUILD_DEPENDS=	swig:devel/swig
+STATIC_LIBS_DESC=	Install static libraries (does not effect sanitizers)
 
 LLVM_TARGETS?=		AArch64;ARM;PowerPC;RISCV;X86
 
@@ -230,6 +231,9 @@ post-install-LIT-on:
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \
 	    ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}FileCheck${COMMAND_SUFFIX}
 
+post-install-STATIC_LIBS-off:
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/lib*.a
+
 TEST_CMD=	'(cd ${WRKSRC}/llvm/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
 do-test:
 	if [ `${ID} -u` = 0 ]; then \
@@ -264,6 +268,7 @@ build-plist:
 	    -e 's|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|' \
 	    | ${SORT} >> ${PLIST}.tmp
 	awk '{ \
+	    if ($$0 ~ /lib.lib[a-zA-Z].*\.a$$/) {printf "%%%%STATIC_LIBS%%%%"} \
 	    if ($$0 ~ /clang/ && $$0 !~ /omp.h/) {printf "%%%%CLANG%%%%"} \
 	    if ($$0 ~ /(bin\/(ld|lld|wasm-ld))|liblld[^b]|\/lld\// && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \
 	    if ($$0 ~ /(argdumper|lldb)/) {printf "%%%%LLDB%%%%"} \
diff --git a/devel/llvm-cheri/pkg-plist b/devel/llvm-cheri/pkg-plist
index 5f5eff6a9890..d1b3c4d24486 100644
--- a/devel/llvm-cheri/pkg-plist
+++ b/devel/llvm-cheri/pkg-plist
@@ -2850,110 +2850,110 @@ llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/VersionFromVCS.cmake
 llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_MAJOR%%git.so
 llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_RELEASE%%git.so
 llvm%%LLVM_SUFFIX%%/lib/libLLVM.so
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64AsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64CodeGen.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64Desc.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64Disassembler.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64Info.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64Utils.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMARMAsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMARMCodeGen.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMARMDesc.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMARMDisassembler.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMARMInfo.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMARMUtils.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAggressiveInstCombine.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAnalysis.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAsmPrinter.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMBinaryFormat.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMBitReader.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMBitWriter.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMBitstreamReader.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMCFGuard.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMCFIVerify.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMCodeGen.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMCore.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMCoroutines.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMCoverage.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMDWARFLinker.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMDWP.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoCodeView.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoDWARF.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoGSYM.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoMSF.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoPDB.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMDebuginfod.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMDemangle.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMDiff.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMDlltoolDriver.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMExecutionEngine.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesis.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesisAArch64.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesisPowerPC.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesisX86.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMExtensions.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMFileCheck.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMFrontendOpenACC.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMFrontendOpenMP.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMFuzzMutate.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMGlobalISel.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMIRReader.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMInstCombine.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMInstrumentation.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMInterfaceStub.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMInterpreter.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMJITLink.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMLTO.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMLibDriver.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMLineEditor.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMLinker.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMMC.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMMCA.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMMCDisassembler.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMMCJIT.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMMCParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMMIRParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMObjCARCOpts.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMObject.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMObjectYAML.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMOption.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMOrcJIT.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMOrcShared.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMOrcTargetProcess.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMPasses.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCAsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCCodeGen.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCDesc.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCDisassembler.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCInfo.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMProfileData.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMRISCVAsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMRISCVCodeGen.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMRISCVDesc.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMRISCVDisassembler.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMRISCVInfo.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMRemarks.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMRuntimeDyld.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMScalarOpts.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMSelectionDAG.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMSupport.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMSymbolize.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMTableGen.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMTableGenGlobalISel.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMTarget.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMTextAPI.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMTransformUtils.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMVectorize.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMWindowsManifest.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMX86AsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMX86CodeGen.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Desc.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Disassembler.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Info.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMX86TargetMCA.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMXRay.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMipo.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64AsmParser.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64CodeGen.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64Desc.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64Disassembler.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64Info.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64Utils.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMARMAsmParser.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMARMCodeGen.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMARMDesc.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMARMDisassembler.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMARMInfo.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMARMUtils.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAggressiveInstCombine.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAnalysis.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAsmParser.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAsmPrinter.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMBinaryFormat.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMBitReader.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMBitWriter.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMBitstreamReader.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMCFGuard.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMCFIVerify.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMCodeGen.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMCore.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMCoroutines.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMCoverage.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDWARFLinker.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDWP.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoCodeView.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoDWARF.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoGSYM.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoMSF.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoPDB.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDebuginfod.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDemangle.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDiff.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDlltoolDriver.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMExecutionEngine.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesis.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesisAArch64.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesisPowerPC.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesisX86.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMExtensions.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMFileCheck.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMFrontendOpenACC.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMFrontendOpenMP.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMFuzzMutate.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMGlobalISel.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMIRReader.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMInstCombine.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMInstrumentation.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMInterfaceStub.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMInterpreter.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMJITLink.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMLTO.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMLibDriver.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMLineEditor.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMLinker.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMMC.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMMCA.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMMCDisassembler.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMMCJIT.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMMCParser.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMMIRParser.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMObjCARCOpts.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMObject.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMObjectYAML.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMOption.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMOrcJIT.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMOrcShared.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMOrcTargetProcess.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMPasses.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCAsmParser.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCCodeGen.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCDesc.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCDisassembler.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCInfo.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMProfileData.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMRISCVAsmParser.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMRISCVCodeGen.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMRISCVDesc.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMRISCVDisassembler.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMRISCVInfo.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMRemarks.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMRuntimeDyld.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMScalarOpts.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMSelectionDAG.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMSupport.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMSymbolize.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMTableGen.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMTableGenGlobalISel.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMTarget.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMTextAPI.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMTransformUtils.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMVectorize.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMWindowsManifest.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMX86AsmParser.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMX86CodeGen.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Desc.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Disassembler.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Info.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMX86TargetMCA.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMXRay.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMipo.a
 llvm%%LLVM_SUFFIX%%/lib/libLTO.so
 llvm%%LLVM_SUFFIX%%/lib/libLTO.so.%%LLVM_MAJOR%%git
 llvm%%LLVM_SUFFIX%%/lib/libRemarks.so
@@ -2963,54 +2963,54 @@ llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.%%LLVM_MAJOR%%git
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_RELEASE%%git
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.13
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAPINotes.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangARCMigrate.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAST.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangASTMatchers.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAnalysis.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAnalysisFlowSensitive.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangBasic.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCodeGen.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCrossTU.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDependencyScanning.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDirectoryWatcher.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDriver.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDynamicASTMatchers.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangEdit.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangFormat.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangFrontend.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangFrontendTool.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangHandleCXX.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangHandleLLVM.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangIndex.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangIndexSerialization.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangInterpreter.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangLex.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangParse.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangRewrite.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangRewriteFrontend.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangSema.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangSerialization.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangStaticAnalyzerCheckers.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangStaticAnalyzerCore.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangStaticAnalyzerFrontend.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangTesting.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangTooling.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingASTDiff.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingCore.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingInclusions.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingRefactoring.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingSyntax.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangTransformer.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAPINotes.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangARCMigrate.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAST.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangASTMatchers.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAnalysis.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAnalysisFlowSensitive.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangBasic.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCodeGen.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCrossTU.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDependencyScanning.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDirectoryWatcher.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDriver.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDynamicASTMatchers.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangEdit.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangFormat.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangFrontend.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangFrontendTool.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangHandleCXX.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangHandleLLVM.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangIndex.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangIndexSerialization.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangInterpreter.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangLex.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangParse.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangRewrite.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangRewriteFrontend.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangSema.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangSerialization.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangStaticAnalyzerCheckers.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangStaticAnalyzerCore.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangStaticAnalyzerFrontend.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangTesting.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangTooling.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingASTDiff.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingCore.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingInclusions.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingRefactoring.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingSyntax.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangTransformer.a
 llvm%%LLVM_SUFFIX%%/lib/libear/__init__.py
 llvm%%LLVM_SUFFIX%%/lib/libear/config.h.in
 llvm%%LLVM_SUFFIX%%/lib/libear/ear.c
-%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldCOFF.a
-%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldCommon.a
-%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldELF.a
-%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldMachO.a
-%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldMinGW.a
-%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldWasm.a
+%%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldCOFF.a
+%%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldCommon.a
+%%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldELF.a
+%%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldMachO.a
+%%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldMinGW.a
+%%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldWasm.a
 llvm%%LLVM_SUFFIX%%/lib/libscanbuild/__init__.py
 llvm%%LLVM_SUFFIX%%/lib/libscanbuild/analyze.py
 llvm%%LLVM_SUFFIX%%/lib/libscanbuild/arguments.py
diff --git a/devel/llvm-morello/pkg-plist b/devel/llvm-morello/pkg-plist
index 46ec9444a0cd..984fcdc36c58 100644
--- a/devel/llvm-morello/pkg-plist
+++ b/devel/llvm-morello/pkg-plist
@@ -2774,101 +2774,101 @@ llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/VersionFromVCS.cmake
 llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_MAJOR%%git.so
 llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_RELEASE%%git.so
 llvm%%LLVM_SUFFIX%%/lib/libLLVM.so
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64AsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64CodeGen.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64Desc.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64Disassembler.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64Info.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64Utils.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMARMAsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMARMCodeGen.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMARMDesc.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMARMDisassembler.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMARMInfo.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMARMUtils.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAggressiveInstCombine.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAnalysis.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAsmPrinter.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMBPFAsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMBPFCodeGen.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMBPFDesc.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMBPFDisassembler.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMBPFInfo.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMBinaryFormat.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMBitReader.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMBitWriter.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMBitstreamReader.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMCFGuard.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMCFIVerify.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMCodeGen.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMCore.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMCoroutines.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMCoverage.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMDWARFLinker.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMDWP.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoCodeView.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoDWARF.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoGSYM.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoMSF.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoPDB.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMDemangle.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMDlltoolDriver.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMExecutionEngine.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesis.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesisAArch64.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesisX86.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMExtensions.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMFileCheck.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMFrontendOpenACC.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMFrontendOpenMP.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMFuzzMutate.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMGlobalISel.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMIRReader.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMInstCombine.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMInstrumentation.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMInterfaceStub.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMInterpreter.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMJITLink.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMLTO.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMLibDriver.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMLineEditor.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMLinker.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMMC.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMMCA.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMMCDisassembler.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMMCJIT.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMMCParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMMIRParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMObjCARCOpts.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMObject.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMObjectYAML.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMOption.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMOrcJIT.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMOrcShared.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMOrcTargetProcess.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMPasses.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMProfileData.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMRemarks.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMRuntimeDyld.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMScalarOpts.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMSelectionDAG.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMSupport.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMSymbolize.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMTableGen.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMTableGenGlobalISel.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMTarget.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMTextAPI.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMTransformUtils.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMVectorize.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMWindowsManifest.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMX86AsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMX86CodeGen.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Desc.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Disassembler.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Info.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMXRay.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMipo.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64AsmParser.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64CodeGen.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64Desc.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64Disassembler.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64Info.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64Utils.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMARMAsmParser.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMARMCodeGen.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMARMDesc.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMARMDisassembler.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMARMInfo.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMARMUtils.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAggressiveInstCombine.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAnalysis.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAsmParser.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAsmPrinter.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMBPFAsmParser.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMBPFCodeGen.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMBPFDesc.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMBPFDisassembler.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMBPFInfo.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMBinaryFormat.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMBitReader.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMBitWriter.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMBitstreamReader.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMCFGuard.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMCFIVerify.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMCodeGen.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMCore.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMCoroutines.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMCoverage.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDWARFLinker.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDWP.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoCodeView.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoDWARF.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoGSYM.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoMSF.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoPDB.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDemangle.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMDlltoolDriver.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMExecutionEngine.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesis.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesisAArch64.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesisX86.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMExtensions.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMFileCheck.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMFrontendOpenACC.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMFrontendOpenMP.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMFuzzMutate.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMGlobalISel.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMIRReader.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMInstCombine.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMInstrumentation.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMInterfaceStub.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMInterpreter.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMJITLink.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMLTO.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMLibDriver.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMLineEditor.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMLinker.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMMC.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMMCA.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMMCDisassembler.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMMCJIT.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMMCParser.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMMIRParser.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMObjCARCOpts.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMObject.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMObjectYAML.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMOption.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMOrcJIT.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMOrcShared.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMOrcTargetProcess.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMPasses.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMProfileData.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMRemarks.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMRuntimeDyld.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMScalarOpts.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMSelectionDAG.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMSupport.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMSymbolize.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMTableGen.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMTableGenGlobalISel.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMTarget.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMTextAPI.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMTransformUtils.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMVectorize.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMWindowsManifest.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMX86AsmParser.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMX86CodeGen.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Desc.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Disassembler.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Info.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMXRay.a
+%%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMipo.a
 llvm%%LLVM_SUFFIX%%/lib/libLTO.so
 llvm%%LLVM_SUFFIX%%/lib/libLTO.so.%%LLVM_MAJOR%%git
 llvm%%LLVM_SUFFIX%%/lib/libRemarks.so
@@ -2878,61 +2878,61 @@ llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.%%LLVM_MAJOR%%git
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_MAJOR%%
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_RELEASE%%git
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAPINotes.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangARCMigrate.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAST.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangASTMatchers.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAnalysis.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangBasic.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCodeGen.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCrossTU.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDependencyScanning.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDirectoryWatcher.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDriver.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDynamicASTMatchers.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangEdit.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangFormat.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangFrontend.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangFrontendTool.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangHandleCXX.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangHandleLLVM.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangIndex.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangIndexSerialization.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangInterpreter.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangLex.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangParse.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangRewrite.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangRewriteFrontend.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangSema.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangSerialization.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangStaticAnalyzerCheckers.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangStaticAnalyzerCore.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangStaticAnalyzerFrontend.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangTesting.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangTooling.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingASTDiff.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingCore.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingInclusions.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingRefactoring.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingSyntax.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangTransformer.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAPINotes.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangARCMigrate.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAST.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangASTMatchers.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAnalysis.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangBasic.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCodeGen.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCrossTU.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDependencyScanning.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDirectoryWatcher.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDriver.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDynamicASTMatchers.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangEdit.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangFormat.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangFrontend.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangFrontendTool.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangHandleCXX.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangHandleLLVM.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangIndex.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangIndexSerialization.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangInterpreter.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangLex.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangParse.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangRewrite.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangRewriteFrontend.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangSema.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangSerialization.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangStaticAnalyzerCheckers.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangStaticAnalyzerCore.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangStaticAnalyzerFrontend.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangTesting.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangTooling.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingASTDiff.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingCore.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingInclusions.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingRefactoring.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingSyntax.a
+%%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangTransformer.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang_cxx.so
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang_cxx.so.%%LLVM_MAJOR%%
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang_cxx.so.%%LLVM_MAJOR%%git
 llvm%%LLVM_SUFFIX%%/lib/libear/__init__.py
 llvm%%LLVM_SUFFIX%%/lib/libear/config.h.in
 llvm%%LLVM_SUFFIX%%/lib/libear/ear.c
-%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldCOFF.a
-%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldCommon.a
-%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldCore.a
-%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldDriver.a
-%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldELF.a
-%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldMachO.a
-%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldMachO2.a
-%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldMinGW.a
-%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldReaderWriter.a
-%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldWasm.a
-%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldYAML.a
+%%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldCOFF.a
+%%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldCommon.a
+%%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldCore.a
+%%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldDriver.a
+%%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldELF.a
+%%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldMachO.a
+%%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldMachO2.a
+%%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldMinGW.a
+%%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldReaderWriter.a
+%%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldWasm.a
+%%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldYAML.a
 llvm%%LLVM_SUFFIX%%/lib/libscanbuild/__init__.py
 llvm%%LLVM_SUFFIX%%/lib/libscanbuild/analyze.py
 llvm%%LLVM_SUFFIX%%/lib/libscanbuild/arguments.py