d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move LIBADD lines from usr.bin/clang/*/Makefile one level up

Browse Source 
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:
Dimitry Andric 2023-07-23 22:04:46 +02:00
parent 9df529b8a1
commit f576172682
26 changed files with 4 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.bin/clang/bugpoint/Makefile
View File

@ -13,7 +13,4 @@ SRCS+= OptimizerDriver.cpp
SRCS+= ToolRunner.cpp
SRCS+= bugpoint.cpp
LIBADD+= z
LIBADD+= zstd
.include "../llvm.prog.mk"

2
usr.bin/clang/clang.prog.mk
View File

@ -29,5 +29,7 @@ LIBADD+= execinfo
LIBADD+= ncursesw
.endif
LIBADD+= pthread
LIBADD+= z
LIBADD+= zstd
.include <bsd.prog.mk>

3
usr.bin/clang/clang/Makefile
View File

@ -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=

3
usr.bin/clang/llc/Makefile
View File

@ -5,7 +5,4 @@ PROG_CXX= llc
SRCDIR= llvm/tools/llc
SRCS+= llc.cpp
LIBADD+= z
LIBADD+= zstd
.include "../llvm.prog.mk"

3
usr.bin/clang/lli/Makefile
View File

@ -6,7 +6,4 @@ SRCDIR= llvm/tools/lli
SRCS+= ExecutionUtils.cpp
SRCS+= lli.cpp
LIBADD+= z
LIBADD+= zstd
.include "../llvm.prog.mk"

2
usr.bin/clang/llvm-ar/Makefile
View File

@ -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"

3
usr.bin/clang/llvm-cov/Makefile
View File

@ -20,7 +20,4 @@ SRCS+= TestingSupport.cpp
SRCS+= gcov.cpp
SRCS+= llvm-cov.cpp
LIBADD+= z
LIBADD+= zstd
.include "../llvm.prog.mk"

3
usr.bin/clang/llvm-dwarfdump/Makefile
View File

@ -7,7 +7,4 @@ SRCS+= SectionSizes.cpp
SRCS+= Statistics.cpp
SRCS+= llvm-dwarfdump.cpp
LIBADD+= z
LIBADD+= zstd
.include "../llvm.prog.mk"

3
usr.bin/clang/llvm-dwarfutil/Makefile
View File

@ -22,7 +22,4 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/}
DPSRCS+= ${TGHDRS}
CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/}
LIBADD+= z
LIBADD+= zstd
.include "../llvm.prog.mk"

3
usr.bin/clang/llvm-dwp/Makefile
View File

@ -6,7 +6,4 @@ MAN=
SRCDIR= llvm/tools/llvm-dwp
SRCS+= llvm-dwp.cpp
LIBADD+= z
LIBADD+= zstd
.include "../llvm.prog.mk"

2
usr.bin/clang/llvm-extract/Makefile
View File

@ -5,6 +5,4 @@ PROG_CXX= llvm-extract
SRCDIR= llvm/tools/llvm-extract
SRCS+= llvm-extract.cpp
LIBADD+= z
.include "../llvm.prog.mk"

3
usr.bin/clang/llvm-lto/Makefile
View File

@ -6,7 +6,4 @@ MAN=
SRCDIR= llvm/tools/llvm-lto
SRCS= llvm-lto.cpp
LIBADD+= z
LIBADD+= zstd
.include "../llvm.prog.mk"

3
usr.bin/clang/llvm-lto2/Makefile
View File

@ -6,7 +6,4 @@ MAN=
SRCDIR= llvm/tools/llvm-lto2
SRCS= llvm-lto2.cpp
LIBADD+= z
LIBADD+= zstd
.include "../llvm.prog.mk"

3
usr.bin/clang/llvm-mc/Makefile
View File

@ -7,7 +7,4 @@ SRCDIR= llvm/tools/llvm-mc
SRCS+= Disassembler.cpp
SRCS+= llvm-mc.cpp
LIBADD+= z
LIBADD+= zstd
.include "../llvm.prog.mk"

2
usr.bin/clang/llvm-mca/Makefile
View File

@ -20,6 +20,4 @@ SRCS+= llvm-mca.cpp
CFLAGS+= -I${LLVM_BASE}/${SRCDIR}
LIBADD+= z
.include "../llvm.prog.mk"

2
usr.bin/clang/llvm-nm/Makefile
View File

@ -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

3
usr.bin/clang/llvm-objcopy/Makefile
View File

@ -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"

3
usr.bin/clang/llvm-objdump/Makefile
View File

@ -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

2
usr.bin/clang/llvm-pdbutil/Makefile
View File

@ -24,6 +24,4 @@ SRCS+= TypeReferenceTracker.cpp
SRCS+= YAMLOutputStyle.cpp
SRCS+= llvm-pdbutil.cpp
LIBADD+= z
.include "../llvm.prog.mk"

3
usr.bin/clang/llvm-profdata/Makefile
View File

@ -7,7 +7,4 @@ SRCS+= llvm-profdata.cpp
CFLAGS.llvm-profdata.cpp+= -Dllvm_profdata_main=main
LIBADD+= z
LIBADD+= zstd
.include "../llvm.prog.mk"

3
usr.bin/clang/llvm-readobj/Makefile
View File

@ -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"

3
usr.bin/clang/llvm-rtdyld/Makefile
View File

@ -6,7 +6,4 @@ MAN=
SRCDIR= llvm/tools/llvm-rtdyld
SRCS+= llvm-rtdyld.cpp
LIBADD+= z
LIBADD+= zstd
.include "../llvm.prog.mk"

3
usr.bin/clang/llvm-symbolizer/Makefile
View File

@ -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"

3
usr.bin/clang/llvm-xray/Makefile
View File

@ -15,7 +15,4 @@ SRCS+= xray-graph.cpp
SRCS+= xray-registry.cpp
SRCS+= xray-stacks.cpp
LIBADD+= z
LIBADD+= zstd
.include "../llvm.prog.mk"

2
usr.bin/clang/llvm.prog.mk
View File

@ -27,5 +27,7 @@ LIBADD+= execinfo
LIBADD+= tinfow
.endif
LIBADD+= pthread
LIBADD+= z
LIBADD+= zstd
.include <bsd.prog.mk>

3
usr.bin/clang/opt/Makefile
View File

@ -8,7 +8,4 @@ SRCS+= BreakpointPrinter.cpp
SRCS+= NewPMDriver.cpp
SRCS+= opt.cpp
LIBADD+= z
LIBADD+= zstd
.include "../llvm.prog.mk"