Date: Tue, 28 Feb 2023 20:52:01 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: d29b33328174 - stable/13 - Do not delete objdump when WITH_LLVM_BINUTILS is true Message-ID: <202302282052.31SKq1h3062935@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d29b333281746cf9a68a247a79991585cdf38732 commit d29b333281746cf9a68a247a79991585cdf38732 Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2022-09-25 19:29:38 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2023-02-28 20:51:33 +0000 Do not delete objdump when WITH_LLVM_BINUTILS is true WITH_LLVM_BINUTILS links /usr/bin/objdump to llvm-objdump, and similarly for the man page. Do not delete them in `make delete-old`. PR: 266603 Sponsored by: The FreeBSD Foundation (cherry picked from commit d1a351be19d4bd03918d44ea33fa7c09655f810a) --- ObsoleteFiles.inc | 4 ---- tools/build/mk/OptionalObsoleteFiles.inc | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 64214e29e93f..37f07a708986 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -3277,10 +3277,6 @@ OLD_FILES+=usr/include/crypto/skipjack.h # 20200511: Remove ubsec(4) OLD_FILES+=usr/share/man/man4/ubsec.4.gz -# 20200506: GNU objdump 2.17.50 retired -OLD_FILES+=usr/bin/objdump -OLD_FILES+=usr/share/man/man1/objdump.1.gz - # 20200428: route_var.h moved to net/route OLD_FILES+=usr/include/net/route_var.h diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 7131c4e3d8ac..c3febff5800e 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2095,6 +2095,11 @@ OLD_FILES+=usr/share/man/man8/strfile.8.gz OLD_FILES+=usr/share/man/man8/unstr.8.gz .endif +.if ${MK_LLVM_BINUTILS} == no +OLD_FILES+=usr/bin/objdump +OLD_FILES+=usr/share/man/man1/objdump.1.gz +.endif + .if ${MK_LLVM_COV} == no && !defined(WITH_PORT_BASE_GCC) OLD_FILES+=usr/bin/gcov OLD_FILES+=usr/share/man/man1/gcov.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302282052.31SKq1h3062935>