Date: Sun, 23 Jul 2023 20:05:44 GMT From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: f57617268240 - main - Move LIBADD lines from usr.bin/clang/*/Makefile one level up Message-ID: <202307232005.36NK5iHc025745@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f576172682401984fcf5e422d31086499caaebcf commit f576172682401984fcf5e422d31086499caaebcf Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2023-07-23 20:04:46 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2023-07-23 20:04:55 +0000 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 --- usr.bin/clang/bugpoint/Makefile | 3 --- usr.bin/clang/clang.prog.mk | 2 ++ usr.bin/clang/clang/Makefile | 3 --- usr.bin/clang/llc/Makefile | 3 --- usr.bin/clang/lli/Makefile | 3 --- usr.bin/clang/llvm-ar/Makefile | 2 -- usr.bin/clang/llvm-cov/Makefile | 3 --- usr.bin/clang/llvm-dwarfdump/Makefile | 3 --- usr.bin/clang/llvm-dwarfutil/Makefile | 3 --- usr.bin/clang/llvm-dwp/Makefile | 3 --- usr.bin/clang/llvm-extract/Makefile | 2 -- usr.bin/clang/llvm-lto/Makefile | 3 --- usr.bin/clang/llvm-lto2/Makefile | 3 --- usr.bin/clang/llvm-mc/Makefile | 3 --- usr.bin/clang/llvm-mca/Makefile | 2 -- usr.bin/clang/llvm-nm/Makefile | 2 -- usr.bin/clang/llvm-objcopy/Makefile | 3 --- usr.bin/clang/llvm-objdump/Makefile | 3 --- usr.bin/clang/llvm-pdbutil/Makefile | 2 -- usr.bin/clang/llvm-profdata/Makefile | 3 --- usr.bin/clang/llvm-readobj/Makefile | 3 --- usr.bin/clang/llvm-rtdyld/Makefile | 3 --- usr.bin/clang/llvm-symbolizer/Makefile | 3 --- usr.bin/clang/llvm-xray/Makefile | 3 --- usr.bin/clang/llvm.prog.mk | 2 ++ usr.bin/clang/opt/Makefile | 3 --- 26 files changed, 4 insertions(+), 67 deletions(-) diff --git a/usr.bin/clang/bugpoint/Makefile b/usr.bin/clang/bugpoint/Makefile index 2ca34d2579e3..2afd888f1df7 100644 --- a/usr.bin/clang/bugpoint/Makefile +++ b/usr.bin/clang/bugpoint/Makefile @@ -13,7 +13,4 @@ SRCS+= OptimizerDriver.cpp SRCS+= ToolRunner.cpp SRCS+= bugpoint.cpp -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk index 79229be332a8..faa4918c7298 100644 --- a/usr.bin/clang/clang.prog.mk +++ b/usr.bin/clang/clang.prog.mk @@ -29,5 +29,7 @@ LIBADD+= execinfo LIBADD+= ncursesw .endif LIBADD+= pthread +LIBADD+= z +LIBADD+= zstd .include <bsd.prog.mk> diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile index 1e946276c76b..4b1e3735939a 100644 --- a/usr.bin/clang/clang/Makefile +++ b/usr.bin/clang/clang/Makefile @@ -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= diff --git a/usr.bin/clang/llc/Makefile b/usr.bin/clang/llc/Makefile index 42835ff00656..a4c68c6baec6 100644 --- a/usr.bin/clang/llc/Makefile +++ b/usr.bin/clang/llc/Makefile @@ -5,7 +5,4 @@ PROG_CXX= llc SRCDIR= llvm/tools/llc SRCS+= llc.cpp -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/lli/Makefile b/usr.bin/clang/lli/Makefile index 0c8d621f42a6..febbebc1accf 100644 --- a/usr.bin/clang/lli/Makefile +++ b/usr.bin/clang/lli/Makefile @@ -6,7 +6,4 @@ SRCDIR= llvm/tools/lli SRCS+= ExecutionUtils.cpp SRCS+= lli.cpp -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile index 3718248f5de9..12a3da13273f 100644 --- a/usr.bin/clang/llvm-ar/Makefile +++ b/usr.bin/clang/llvm-ar/Makefile @@ -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" diff --git a/usr.bin/clang/llvm-cov/Makefile b/usr.bin/clang/llvm-cov/Makefile index 9c6cafab0561..5bf4797d48e2 100644 --- a/usr.bin/clang/llvm-cov/Makefile +++ b/usr.bin/clang/llvm-cov/Makefile @@ -20,7 +20,4 @@ SRCS+= TestingSupport.cpp SRCS+= gcov.cpp SRCS+= llvm-cov.cpp -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-dwarfdump/Makefile b/usr.bin/clang/llvm-dwarfdump/Makefile index d5aaf812f8c4..cdf976a7c272 100644 --- a/usr.bin/clang/llvm-dwarfdump/Makefile +++ b/usr.bin/clang/llvm-dwarfdump/Makefile @@ -7,7 +7,4 @@ SRCS+= SectionSizes.cpp SRCS+= Statistics.cpp SRCS+= llvm-dwarfdump.cpp -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-dwarfutil/Makefile b/usr.bin/clang/llvm-dwarfutil/Makefile index 0be0eefcea3e..cc5ebf4275fb 100644 --- a/usr.bin/clang/llvm-dwarfutil/Makefile +++ b/usr.bin/clang/llvm-dwarfutil/Makefile @@ -22,7 +22,4 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-dwp/Makefile b/usr.bin/clang/llvm-dwp/Makefile index c47729aea678..4732be082e70 100644 --- a/usr.bin/clang/llvm-dwp/Makefile +++ b/usr.bin/clang/llvm-dwp/Makefile @@ -6,7 +6,4 @@ MAN= SRCDIR= llvm/tools/llvm-dwp SRCS+= llvm-dwp.cpp -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-extract/Makefile b/usr.bin/clang/llvm-extract/Makefile index 7a0a5b205a4f..2cfb9a13455d 100644 --- a/usr.bin/clang/llvm-extract/Makefile +++ b/usr.bin/clang/llvm-extract/Makefile @@ -5,6 +5,4 @@ PROG_CXX= llvm-extract SRCDIR= llvm/tools/llvm-extract SRCS+= llvm-extract.cpp -LIBADD+= z - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-lto/Makefile b/usr.bin/clang/llvm-lto/Makefile index 35e2b87fef3c..f216412b2e8a 100644 --- a/usr.bin/clang/llvm-lto/Makefile +++ b/usr.bin/clang/llvm-lto/Makefile @@ -6,7 +6,4 @@ MAN= SRCDIR= llvm/tools/llvm-lto SRCS= llvm-lto.cpp -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-lto2/Makefile b/usr.bin/clang/llvm-lto2/Makefile index 37a5e7f794c0..78ca08fff06c 100644 --- a/usr.bin/clang/llvm-lto2/Makefile +++ b/usr.bin/clang/llvm-lto2/Makefile @@ -6,7 +6,4 @@ MAN= SRCDIR= llvm/tools/llvm-lto2 SRCS= llvm-lto2.cpp -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-mc/Makefile b/usr.bin/clang/llvm-mc/Makefile index cb3080481607..ee9d1c41c8c1 100644 --- a/usr.bin/clang/llvm-mc/Makefile +++ b/usr.bin/clang/llvm-mc/Makefile @@ -7,7 +7,4 @@ SRCDIR= llvm/tools/llvm-mc SRCS+= Disassembler.cpp SRCS+= llvm-mc.cpp -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-mca/Makefile b/usr.bin/clang/llvm-mca/Makefile index 727651146c52..268ca8805a0b 100644 --- a/usr.bin/clang/llvm-mca/Makefile +++ b/usr.bin/clang/llvm-mca/Makefile @@ -20,6 +20,4 @@ SRCS+= llvm-mca.cpp CFLAGS+= -I${LLVM_BASE}/${SRCDIR} -LIBADD+= z - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile index 30071da0e7dc..d71295d0313d 100644 --- a/usr.bin/clang/llvm-nm/Makefile +++ b/usr.bin/clang/llvm-nm/Makefile @@ -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 diff --git a/usr.bin/clang/llvm-objcopy/Makefile b/usr.bin/clang/llvm-objcopy/Makefile index 335badf81ed9..181a307457a9 100644 --- a/usr.bin/clang/llvm-objcopy/Makefile +++ b/usr.bin/clang/llvm-objcopy/Makefile @@ -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" diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile index d8d80443d965..390bf40b851c 100644 --- a/usr.bin/clang/llvm-objdump/Makefile +++ b/usr.bin/clang/llvm-objdump/Makefile @@ -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 diff --git a/usr.bin/clang/llvm-pdbutil/Makefile b/usr.bin/clang/llvm-pdbutil/Makefile index 5036955f775a..6e91c0424f2f 100644 --- a/usr.bin/clang/llvm-pdbutil/Makefile +++ b/usr.bin/clang/llvm-pdbutil/Makefile @@ -24,6 +24,4 @@ SRCS+= TypeReferenceTracker.cpp SRCS+= YAMLOutputStyle.cpp SRCS+= llvm-pdbutil.cpp -LIBADD+= z - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-profdata/Makefile b/usr.bin/clang/llvm-profdata/Makefile index b3b0d63346de..1538aacdb493 100644 --- a/usr.bin/clang/llvm-profdata/Makefile +++ b/usr.bin/clang/llvm-profdata/Makefile @@ -7,7 +7,4 @@ SRCS+= llvm-profdata.cpp CFLAGS.llvm-profdata.cpp+= -Dllvm_profdata_main=main -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-readobj/Makefile b/usr.bin/clang/llvm-readobj/Makefile index d47cdfa329fc..0c1afcae6d0b 100644 --- a/usr.bin/clang/llvm-readobj/Makefile +++ b/usr.bin/clang/llvm-readobj/Makefile @@ -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" diff --git a/usr.bin/clang/llvm-rtdyld/Makefile b/usr.bin/clang/llvm-rtdyld/Makefile index 6c7bd97f4bd0..37977771eddb 100644 --- a/usr.bin/clang/llvm-rtdyld/Makefile +++ b/usr.bin/clang/llvm-rtdyld/Makefile @@ -6,7 +6,4 @@ MAN= SRCDIR= llvm/tools/llvm-rtdyld SRCS+= llvm-rtdyld.cpp -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-symbolizer/Makefile b/usr.bin/clang/llvm-symbolizer/Makefile index 0308b58bba55..5da4840b1594 100644 --- a/usr.bin/clang/llvm-symbolizer/Makefile +++ b/usr.bin/clang/llvm-symbolizer/Makefile @@ -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" diff --git a/usr.bin/clang/llvm-xray/Makefile b/usr.bin/clang/llvm-xray/Makefile index 1be3eb059e81..5e84483e4f6b 100644 --- a/usr.bin/clang/llvm-xray/Makefile +++ b/usr.bin/clang/llvm-xray/Makefile @@ -15,7 +15,4 @@ SRCS+= xray-graph.cpp SRCS+= xray-registry.cpp SRCS+= xray-stacks.cpp -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm.prog.mk b/usr.bin/clang/llvm.prog.mk index 3a708805d3ea..87a369b825f1 100644 --- a/usr.bin/clang/llvm.prog.mk +++ b/usr.bin/clang/llvm.prog.mk @@ -27,5 +27,7 @@ LIBADD+= execinfo LIBADD+= tinfow .endif LIBADD+= pthread +LIBADD+= z +LIBADD+= zstd .include <bsd.prog.mk> diff --git a/usr.bin/clang/opt/Makefile b/usr.bin/clang/opt/Makefile index 27e0395942f6..ca209cec45ac 100644 --- a/usr.bin/clang/opt/Makefile +++ b/usr.bin/clang/opt/Makefile @@ -8,7 +8,4 @@ SRCS+= BreakpointPrinter.cpp SRCS+= NewPMDriver.cpp SRCS+= opt.cpp -LIBADD+= z -LIBADD+= zstd - .include "../llvm.prog.mk"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307232005.36NK5iHc025745>