From 175ecf41754b9248d5fd06e2689ae69b3c280430 Mon Sep 17 00:00:00 2001 From: emaste Date: Mon, 18 May 2015 15:02:35 +0000 Subject: 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 --- gnu/lib/Makefile | 4 ++-- tools/build/mk/OptionalObsoleteFiles.inc | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 6d28e13..a208c79 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -2,10 +2,10 @@ .include -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" diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index ec22f63..632983e 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -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 -- cgit v1.1