Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 May 2015 15:02:36 +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: r283060 - in head: gnu/lib tools/build/mk
Message-ID:  <201505181502.t4IF2auV048455@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: emaste
Date: Mon May 18 15:02:35 2015
New Revision: 283060
URL: https://svnweb.freebsd.org/changeset/base/283060

Log:
  Build libgcov only if we're building base system GCC
  
  Clang uses compiler-rt for the code coverage runtime, and ports GCC
  provides its own libgcov.
  
  PR:		200203 (exp-run)
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/gnu/lib/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/gnu/lib/Makefile
==============================================================================
--- head/gnu/lib/Makefile	Mon May 18 14:27:04 2015	(r283059)
+++ head/gnu/lib/Makefile	Mon May 18 15:02:35 2015	(r283060)
@@ -2,10 +2,10 @@
 
 .include <src.opts.mk>
 
-SUBDIR= csu libgcc libgcov libdialog libregex libreadline
+SUBDIR= csu libgcc libdialog libregex libreadline
 
 .if ${MK_GCC} != "no"
-SUBDIR+= libgomp
+SUBDIR+= libgcov libgomp
 .endif
 
 .if ${MK_SSP} != "no"

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Mon May 18 14:27:04 2015	(r283059)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Mon May 18 15:02:35 2015	(r283060)
@@ -1744,6 +1744,7 @@ OLD_FILES+=usr/include/gcc/4.2/ppc-asm.h
 OLD_FILES+=usr/include/gcc/4.2/spe.h
 .endif
 OLD_FILES+=usr/include/omp.h
+OLD_FILES+=usr/lib/libgcov.a
 OLD_FILES+=usr/lib/libgomp.a
 OLD_FILES+=usr/lib/libgomp.so
 OLD_FILES+=usr/lib/libgomp.so.1



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