Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 9 Nov 2018 17:43:19 +0000 (UTC)
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r340289 - in head: tools/build/mk usr.bin/clang/llvm-cov
Message-ID:  <201811091743.wA9HhJSR004334@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: emaste
Date: Fri Nov  9 17:43:19 2018
New Revision: 340289
URL: https://svnweb.freebsd.org/changeset/base/340289

Log:
  llvm-cov: also install as gcov (if GNU gcov is disabled)
  
  llvm-cov provides a gcov-compatible interface when invoked as gcov.
  
  Reviewed by:	dim, markj
  MFC after:	1 month
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D17923

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

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Fri Nov  9 17:39:57 2018	(r340288)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Fri Nov  9 17:43:19 2018	(r340289)
@@ -2461,7 +2461,7 @@ OLD_FILES+=usr/share/man/man1/gperf.1.gz
 OLD_FILES+=usr/share/man/man1/gperf.7.gz
 .endif
 
-.if ${MK_GCC} == no || ${MK_GCOV} == no
+.if (${MK_GCOV} == no || ${MK_GCC} == no) && ${MK_LLVM_COV} == no
 OLD_FILES+=usr/bin/gcov
 OLD_FILES+=usr/share/man/man1/gcov.1.gz
 .endif

Modified: head/usr.bin/clang/llvm-cov/Makefile
==============================================================================
--- head/usr.bin/clang/llvm-cov/Makefile	Fri Nov  9 17:39:57 2018	(r340288)
+++ head/usr.bin/clang/llvm-cov/Makefile	Fri Nov  9 17:43:19 2018	(r340289)
@@ -1,6 +1,12 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PROG_CXX=	llvm-cov
+.if ${MK_GCOV} == "no"
+LINKS=		${BINDIR}/llvm-cov	${BINDIR}/gcov
+MLINKS=		llvm-cov.1		gcov.1
+.endif
 
 SRCDIR=		tools/llvm-cov
 SRCS+=		CodeCoverage.cpp



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811091743.wA9HhJSR004334>