svn commit: r340296 - in head: tools/build/mk usr.bin/clang

[Ed Maste]

Author: emaste
Date: Fri Nov  9 18:35:09 2018
New Revision: 340296
URL: https://svnweb.freebsd.org/changeset/base/340296

Log:
  Move llvm-profdata build into MK_LLVM_COV block
  
  llvm-profdata is used with llvm-cov for code coverage (although llvm-cov
  can also operate independently in a gcov-compatible mode).
  Although llvm-profdata can be used independently of llvm-cov it makes
  sense to group these under one option.
  
  Also handle these in OptionalObsoleteFiles.inc while here.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/tools/build/mk/OptionalObsoleteFiles.inc
  head/usr.bin/clang/Makefile

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Fri Nov  9 18:06:25 2018	(r340295)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Fri Nov  9 18:35:09 2018	(r340296)
@@ -2466,6 +2466,12 @@ 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
+.endif
+
 .if ${MK_GDB} == no || ${MK_GDB_LIBEXEC} == yes
 OLD_FILES+=usr/bin/gdb
 OLD_FILES+=usr/bin/gdbserver

Modified: head/usr.bin/clang/Makefile
==============================================================================
--- head/usr.bin/clang/Makefile	Fri Nov  9 18:06:25 2018	(r340295)
+++ head/usr.bin/clang/Makefile	Fri Nov  9 18:35:09 2018	(r340296)
@@ -31,7 +31,6 @@ SUBDIR+=	llvm-modextract
 SUBDIR+=	llvm-nm
 SUBDIR+=	llvm-objcopy
 SUBDIR+=	llvm-pdbutil
-SUBDIR+=	llvm-profdata
 SUBDIR+=	llvm-rtdyld
 SUBDIR+=	llvm-symbolizer
 SUBDIR+=	llvm-xray
@@ -46,6 +45,7 @@ SUBDIR+=	lldb
 .endif
 .if ${MK_LLVM_COV} != "no"
 SUBDIR+=	llvm-cov
+SUBDIR+=	llvm-profdata
 .endif
 .endif # TOOLS_PREFIX