git: b35fc7c31542 - stable/14 - Combine and sort MK_LLVM_COV

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Brooks Davis <brooks_at_FreeBSD.org>
Date: Sat, 02 Dec 2023 00:54:55 UTC
The branch stable/14 has been updated by brooks:

URL: https://cgit.FreeBSD.org/src/commit/?id=b35fc7c315426e9d339a7911c18ecba0edb888e3

commit b35fc7c315426e9d339a7911c18ecba0edb888e3
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2023-11-09 01:00:36 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2023-12-02 00:11:32 +0000

    Combine and sort MK_LLVM_COV
    
    These used to be grouped with MK_GCOV option or the like.
    
    Reviewed by:    emaste, imp, netchild
    Pull Request:   https://github.com/freebsd/freebsd-src/pull/896
    
    (cherry picked from commit fb173fc89e9c6908426bf60b1a449f1ff19d51df)
---
 tools/build/mk/OptionalObsoleteFiles.inc | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index f9867f8814a0..f3122cfb1981 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1999,18 +1999,6 @@ OLD_FILES+=usr/share/man/man8/strfile.8.gz
 OLD_FILES+=usr/share/man/man8/unstr.8.gz
 .endif
 
-.if ${MK_LLVM_COV} == no
-OLD_FILES+=usr/bin/gcov
-OLD_FILES+=usr/share/man/man1/gcov.1.gz
-.endif
-
-.if ${MK_LLVM_COV} == no
-OLD_FILES+=usr/bin/llvm-cov
-OLD_FILES+=usr/bin/llvm-profdata
-OLD_FILES+=usr/share/man/man1/llvm-cov.1.gz
-OLD_FILES+=usr/share/man/man1/llvm-profdata.1.gz
-.endif
-
 .if ${MK_GH_BC} == no
 OLD_FILES+=usr/share/misc/bc.library
 OLD_FILES+=usr/tests/usr.bin/dc/Kyuafile
@@ -3634,6 +3622,15 @@ OLD_FILES+=usr/share/man/man1/lldb-server.1.gz
 OLD_FILES+=usr/share/man/man1/lldb.1.gz
 .endif
 
+.if ${MK_LLVM_COV} == no
+OLD_FILES+=usr/bin/gcov
+OLD_FILES+=usr/bin/llvm-cov
+OLD_FILES+=usr/bin/llvm-profdata
+OLD_FILES+=usr/share/man/man1/gcov.1.gz
+OLD_FILES+=usr/share/man/man1/llvm-cov.1.gz
+OLD_FILES+=usr/share/man/man1/llvm-profdata.1.gz
+.endif
+
 .if ${MK_LOCALES} == no
 OLD_DIRS+=usr/share/locale/af_ZA.ISO8859-15
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_COLLATE