Attachment 156800 Details for Bug 200203 – patch v2 (libgcov only), now that libgomp removal is committed in r282973

[patch] patch v2 (libgcov only), now that libgomp removal is committed in r282973

libgcov-with-gcc-only.diff (text/plain), 1.16 KB, created by Ed Maste on 2015-05-15 14:25:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ed Maste

Created: 2015-05-15 14:25:30 UTC

Size: 1.16 KB

patch

obsolete

>commit 94b91d2aac9fea06475bb86ac86fe8fa1e3e58af
>Author: Ed Maste <emaste@freebsd.org>
>Date:   Wed May 6 12:30:21 2015 -0400
>
>    Build libgcov only if we're building base system GCC
>    
>    Clang uses libcompiler_rt for the code coverage runtime, and ports GCC
>    provides its own libgcov.
>    
>    PR:		200203 (exp-run)
>
>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 <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"
>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

Actions: View | Diff

Attachments on bug 200203: 156783 | 156800