From nobody Wed Jul 26 18:05:58 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RB1zW04Zjz4pg2Q; Wed, 26 Jul 2023 18:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RB1zV3ZbPz3rYK; Wed, 26 Jul 2023 18:05:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690394758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VfWD4/+VxVPWmFaMoJEjChXLTF+2SlmAaPbhqRUeL28=; b=kRV9wlFY+C7+AmIlBQuD7qnZvyxmbL6LnSyFKha0ojP3ayNdkxRkjZ2w16Os0Gg4Pf8Hsj y5o/9LgMRDe6Yy9gz+c5OGcgQq6YniGSrx0we2AZdAh6gpfMfmXPkPrGlnyPdzNywjrefz +N5zokXko+QoMV0Strx+cHKAdVHOLgCpdK1oyI6cgLiq/sIvQVUcU+CEcQKFexWTTCpViY M5vDAc3Z24nOi6D6SGOeQTKZukRB4qAv0ZJMFfXbuPIgLpRvadZI6WPPbhTXV0whthvXGB Dbs0kRPCCpy8N4bLBwfQE+VBHmEPE/oUGCKfwaYqgkdTDgpnAOideW5Ybmb/jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690394758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VfWD4/+VxVPWmFaMoJEjChXLTF+2SlmAaPbhqRUeL28=; b=pm3SSflgTFn/g/y7Xs0eFP8Sh6DVGPYAtmfcDEeNmbJofwWIgwidPdl2QGskls7T5OEblj obO9UlqEXVG3no4BPunfTVb+1IMiPkkZSCrReBz+1GAdvONUFKbZXfNFLMPVPsBq4DhtTL aqXyLkvWVfvF0LSGcXZ+KALnZTKfpilG4AadLNUjGaBEan//LjNl+RZ7wNhWus78j6xU4J Mx73IAP+gkv5c+PEqRYBIKnruXn+1UPXUSsD1jDlaFFNgWGzE+7lIgzE8y+YElOsTrfT+c lQdMWeqbFJQ3BfOQF8gssE6wrucOdZdyjMQU7BemtaErfol6kDCm/Mn9ID0zNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690394758; a=rsa-sha256; cv=none; b=FaDUPlC8Mcbp1TdUjIdBw/ZzVttXKVVmAz4uWod0B9nHOEpf8vQx2f1egN/FX0TIChdp3N tWdGDMHN8TQpNrsXv+X7zkcFbrFznYDeRXP2H4Fs9S9xPhlgDaLMjP9lB2QRQ3qVi4jEGw ynDyMaRDUAfdMe9mSlX26cuN4T9zevRD1uK72UI/+HkRhQ/3Wv/IyoZ98M5csgEMvFA+4E 8LaBAQcDas7OHY0h1mil7BnVP0bRIojynlrNyzPYtl2ZS8eo7FBoMENksmdUpeeE5X/0hb d8NiACUp8/TE6ZjsHPd1kJS8wV6qc/E6nTDlx8Ssf98HJey2razm10EBtXSkGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RB1zV2dhdzsl7; Wed, 26 Jul 2023 18:05:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36QI5wVk087462; Wed, 26 Jul 2023 18:05:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36QI5wS1087461; Wed, 26 Jul 2023 18:05:58 GMT (envelope-from git) Date: Wed, 26 Jul 2023 18:05:58 GMT Message-Id: <202307261805.36QI5wS1087461@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: ca54e5c484ca - stable/13 - Move LIBADD lines from usr.bin/clang/*/Makefile one level up List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ca54e5c484caf54e674cc1236be1f7c9e6d193cc Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ca54e5c484caf54e674cc1236be1f7c9e6d193cc commit ca54e5c484caf54e674cc1236be1f7c9e6d193cc Author: Dimitry Andric AuthorDate: 2023-07-23 20:04:46 +0000 Commit: Dimitry Andric CommitDate: 2023-07-26 18:03:26 +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 (cherry picked from commit f576172682401984fcf5e422d31086499caaebcf) --- 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 | 3 --- 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 | 3 --- 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(+), 69 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 diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile index 8a654020d837..efeb49f891e0 100644 --- a/usr.bin/clang/clang/Makefile +++ b/usr.bin/clang/clang/Makefile @@ -34,9 +34,6 @@ MLINKS+= clang.1 cc.1 \ clang.1 cpp.1 .endif -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 dd58fb18c417..12a3da13273f 100644 --- a/usr.bin/clang/llvm-ar/Makefile +++ b/usr.bin/clang/llvm-ar/Makefile @@ -10,9 +10,6 @@ SRCS+= llvm-ar.cpp CFLAGS.llvm-ar.cpp+= -Dllvm_ar_main=main -LIBADD+= z -LIBADD+= zstd - 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 2c19f02e49de..d71295d0313d 100644 --- a/usr.bin/clang/llvm-nm/Makefile +++ b/usr.bin/clang/llvm-nm/Makefile @@ -25,9 +25,6 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} -LIBADD+= z -LIBADD+= zstd - .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 56698c4138d3..053450f38e95 100644 --- a/usr.bin/clang/llvm.prog.mk +++ b/usr.bin/clang/llvm.prog.mk @@ -27,5 +27,7 @@ LIBADD+= execinfo LIBADD+= ncursesw .endif LIBADD+= pthread +LIBADD+= z +LIBADD+= zstd .include 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"