svn commit: r340287 - head/tools/build/mk

[Ed Maste]

Author: emaste
Date: Fri Nov  9 15:27:41 2018
New Revision: 340287
URL: https://svnweb.freebsd.org/changeset/base/340287

Log:
  Consolidate gcov entries in OptionalObsoleteFiles
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Fri Nov  9 15:24:24 2018	(r340286)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Fri Nov  9 15:27:41 2018	(r340287)
@@ -2420,7 +2420,6 @@ OLD_FILES+=usr/share/man/man8/unstr.8.gz
 .if ${MK_GCC} == no
 OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/bin/gcc
-OLD_FILES+=usr/bin/gcov
 OLD_FILES+=usr/bin/gcpp
 OLD_FILES+=usr/bin/gperf
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
@@ -2457,13 +2456,12 @@ OLD_FILES+=usr/libexec/cc1
 OLD_FILES+=usr/libexec/cc1plus
 OLD_FILES+=usr/share/man/man1/g++.1.gz
 OLD_FILES+=usr/share/man/man1/gcc.1.gz
-OLD_FILES+=usr/share/man/man1/gcov.1.gz
 OLD_FILES+=usr/share/man/man1/gcpp.1.gz
 OLD_FILES+=usr/share/man/man1/gperf.1.gz
 OLD_FILES+=usr/share/man/man1/gperf.7.gz
 .endif
 
-.if ${MK_GCOV} == no
+.if ${MK_GCC} == no || ${MK_GCOV} == no
 OLD_FILES+=usr/bin/gcov
 OLD_FILES+=usr/share/man/man1/gcov.1.gz
 .endif