Move LIBADD lines from usr.bin/clang/*/Makefile one level up
Some utilities under usr.bin/clang were only linked to libz, while most others were linked to libz and libzstd. Make this consistent, and remove repetition, by moving these LIBADD lines to usr.bin/clang/clang.prog.mk and usr.bin/clang/clang.prog.mk. MFC after: 3 days
This commit is contained in:
parent
9df529b8a1
commit
f576172682
@ -13,7 +13,4 @@ SRCS+= OptimizerDriver.cpp
|
||||
SRCS+= ToolRunner.cpp
|
||||
SRCS+= bugpoint.cpp
|
||||
|
||||
LIBADD+= z
|
||||
LIBADD+= zstd
|
||||
|
||||
.include "../llvm.prog.mk"
|
||||
|
@ -29,5 +29,7 @@ LIBADD+= execinfo
|
||||
LIBADD+= ncursesw
|
||||
.endif
|
||||
LIBADD+= pthread
|
||||
LIBADD+= z
|
||||
LIBADD+= zstd
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -33,9 +33,6 @@ MLINKS+= clang.1 cc.1 \
|
||||
clang.1 CC.1 \
|
||||
clang.1 cpp.1
|
||||
|
||||
LIBADD+= z
|
||||
LIBADD+= zstd
|
||||
|
||||
# Ensure we don't add CFLAGS.clang when using GCC
|
||||
NO_TARGET_FLAGS=
|
||||
|
||||
|
@ -5,7 +5,4 @@ PROG_CXX= llc
|
||||
SRCDIR= llvm/tools/llc
|
||||
SRCS+= llc.cpp
|
||||
|
||||
LIBADD+= z
|
||||
LIBADD+= zstd
|
||||
|
||||
.include "../llvm.prog.mk"
|
||||
|
@ -6,7 +6,4 @@ SRCDIR= llvm/tools/lli
|
||||
SRCS+= ExecutionUtils.cpp
|
||||
SRCS+= lli.cpp
|
||||
|
||||
LIBADD+= z
|
||||
LIBADD+= zstd
|
||||
|
||||
.include "../llvm.prog.mk"
|
||||
|
@ -10,8 +10,6 @@ SRCS+= llvm-ar.cpp
|
||||
|
||||
CFLAGS.llvm-ar.cpp+= -Dllvm_ar_main=main
|
||||
|
||||
LIBADD+= z
|
||||
|
||||
LINKS+= ${BINDIR}/llvm-ar ${BINDIR}/llvm-ranlib
|
||||
|
||||
.if ${MK_LLVM_BINUTILS} != "no"
|
||||
|
@ -20,7 +20,4 @@ SRCS+= TestingSupport.cpp
|
||||
SRCS+= gcov.cpp
|
||||
SRCS+= llvm-cov.cpp
|
||||
|
||||
LIBADD+= z
|
||||
LIBADD+= zstd
|
||||
|
||||
.include "../llvm.prog.mk"
|
||||
|
@ -7,7 +7,4 @@ SRCS+= SectionSizes.cpp
|
||||
SRCS+= Statistics.cpp
|
||||
SRCS+= llvm-dwarfdump.cpp
|
||||
|
||||
LIBADD+= z
|
||||
LIBADD+= zstd
|
||||
|
||||
.include "../llvm.prog.mk"
|
||||
|
@ -22,7 +22,4 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/}
|
||||
DPSRCS+= ${TGHDRS}
|
||||
CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/}
|
||||
|
||||
LIBADD+= z
|
||||
LIBADD+= zstd
|
||||
|
||||
.include "../llvm.prog.mk"
|
||||
|
@ -6,7 +6,4 @@ MAN=
|
||||
SRCDIR= llvm/tools/llvm-dwp
|
||||
SRCS+= llvm-dwp.cpp
|
||||
|
||||
LIBADD+= z
|
||||
LIBADD+= zstd
|
||||
|
||||
.include "../llvm.prog.mk"
|
||||
|
@ -5,6 +5,4 @@ PROG_CXX= llvm-extract
|
||||
SRCDIR= llvm/tools/llvm-extract
|
||||
SRCS+= llvm-extract.cpp
|
||||
|
||||
LIBADD+= z
|
||||
|
||||
.include "../llvm.prog.mk"
|
||||
|
@ -6,7 +6,4 @@ MAN=
|
||||
SRCDIR= llvm/tools/llvm-lto
|
||||
SRCS= llvm-lto.cpp
|
||||
|
||||
LIBADD+= z
|
||||
LIBADD+= zstd
|
||||
|
||||
.include "../llvm.prog.mk"
|
||||
|
@ -6,7 +6,4 @@ MAN=
|
||||
SRCDIR= llvm/tools/llvm-lto2
|
||||
SRCS= llvm-lto2.cpp
|
||||
|
||||
LIBADD+= z
|
||||
LIBADD+= zstd
|
||||
|
||||
.include "../llvm.prog.mk"
|
||||
|
@ -7,7 +7,4 @@ SRCDIR= llvm/tools/llvm-mc
|
||||
SRCS+= Disassembler.cpp
|
||||
SRCS+= llvm-mc.cpp
|
||||
|
||||
LIBADD+= z
|
||||
LIBADD+= zstd
|
||||
|
||||
.include "../llvm.prog.mk"
|
||||
|
@ -20,6 +20,4 @@ SRCS+= llvm-mca.cpp
|
||||
|
||||
CFLAGS+= -I${LLVM_BASE}/${SRCDIR}
|
||||
|
||||
LIBADD+= z
|
||||
|
||||
.include "../llvm.prog.mk"
|
||||
|
@ -25,8 +25,6 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/}
|
||||
DPSRCS+= ${TGHDRS}
|
||||
CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/}
|
||||
|
||||
LIBADD+= z
|
||||
|
||||
.if ${MK_LLVM_BINUTILS} != "no"
|
||||
LINKS+= ${BINDIR}/llvm-nm ${BINDIR}/nm
|
||||
MLINKS+= llvm-nm.1 nm.1
|
||||
|
@ -27,9 +27,6 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/}
|
||||
DPSRCS+= ${TGHDRS}
|
||||
CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/}
|
||||
|
||||
LIBADD+= z
|
||||
LIBADD+= zstd
|
||||
|
||||
LINKS= ${BINDIR}/llvm-objcopy ${BINDIR}/llvm-strip
|
||||
|
||||
.if ${MK_LLVM_BINUTILS} != "no"
|
||||
|
@ -30,9 +30,6 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/}
|
||||
DPSRCS+= ${TGHDRS}
|
||||
CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/}
|
||||
|
||||
LIBADD+= z
|
||||
LIBADD+= zstd
|
||||
|
||||
LINKS= ${BINDIR}/llvm-objdump ${BINDIR}/objdump
|
||||
MLINKS= llvm-objdump.1 objdump.1
|
||||
|
||||
|
@ -24,6 +24,4 @@ SRCS+= TypeReferenceTracker.cpp
|
||||
SRCS+= YAMLOutputStyle.cpp
|
||||
SRCS+= llvm-pdbutil.cpp
|
||||
|
||||
LIBADD+= z
|
||||
|
||||
.include "../llvm.prog.mk"
|
||||
|
@ -7,7 +7,4 @@ SRCS+= llvm-profdata.cpp
|
||||
|
||||
CFLAGS.llvm-profdata.cpp+= -Dllvm_profdata_main=main
|
||||
|
||||
LIBADD+= z
|
||||
LIBADD+= zstd
|
||||
|
||||
.include "../llvm.prog.mk"
|
||||
|
@ -36,9 +36,6 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/}
|
||||
DPSRCS+= ${TGHDRS}
|
||||
CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/}
|
||||
|
||||
LIBADD+= z
|
||||
LIBADD+= zstd
|
||||
|
||||
LINKS+= ${BINDIR}/llvm-readobj ${BINDIR}/llvm-readelf
|
||||
|
||||
.if ${MK_LLVM_BINUTILS} != "no"
|
||||
|
@ -6,7 +6,4 @@ MAN=
|
||||
SRCDIR= llvm/tools/llvm-rtdyld
|
||||
SRCS+= llvm-rtdyld.cpp
|
||||
|
||||
LIBADD+= z
|
||||
LIBADD+= zstd
|
||||
|
||||
.include "../llvm.prog.mk"
|
||||
|
@ -24,9 +24,6 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/}
|
||||
DPSRCS+= ${TGHDRS}
|
||||
CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/}
|
||||
|
||||
LIBADD+= z
|
||||
LIBADD+= zstd
|
||||
|
||||
LINKS+= ${BINDIR}/llvm-symbolizer ${BINDIR}/llvm-addr2line
|
||||
|
||||
.if ${MK_LLVM_BINUTILS} != "no"
|
||||
|
@ -15,7 +15,4 @@ SRCS+= xray-graph.cpp
|
||||
SRCS+= xray-registry.cpp
|
||||
SRCS+= xray-stacks.cpp
|
||||
|
||||
LIBADD+= z
|
||||
LIBADD+= zstd
|
||||
|
||||
.include "../llvm.prog.mk"
|
||||
|
@ -27,5 +27,7 @@ LIBADD+= execinfo
|
||||
LIBADD+= tinfow
|
||||
.endif
|
||||
LIBADD+= pthread
|
||||
LIBADD+= z
|
||||
LIBADD+= zstd
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -8,7 +8,4 @@ SRCS+= BreakpointPrinter.cpp
|
||||
SRCS+= NewPMDriver.cpp
|
||||
SRCS+= opt.cpp
|
||||
|
||||
LIBADD+= z
|
||||
LIBADD+= zstd
|
||||
|
||||
.include "../llvm.prog.mk"
|
||||
|
Loading…
Reference in New Issue
Block a user