Attachment 147922 Details for Bug 194103 – patch to disable gperf when not building g++

[patch] patch to disable gperf when not building g++

no-gperf.diff (text/plain), 1.14 KB, created by Ed Maste on 2014-10-02 21:27:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ed Maste

Created: 2014-10-02 21:27:51 UTC

Size: 1.14 KB

patch

obsolete

>commit 06bb13fc89d03e63e0a72eb478019faac949b61b
>Author: Ed Maste <emaste@freebsd.org>
>Date:   Thu Oct 2 16:44:38 2014 -0400
>
>    Build gperf only if we're using g++, not clang++
>
>diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
>index 7b1482d..a320191 100644
>--- a/gnu/usr.bin/Makefile
>+++ b/gnu/usr.bin/Makefile
>@@ -18,7 +18,9 @@ SUBDIR= ${_binutils} \
> 	${_texinfo}
> 
> .if ${MK_CXX} != "no"
>+.if ${MK_GCC} != "no"
> _gperf=		gperf
>+.endif
> .if ${MK_GROFF} != "no"
> _groff=		groff
> .endif
>diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
>index a12775b..0fbbb6b 100644
>--- a/tools/build/mk/OptionalObsoleteFiles.inc
>+++ b/tools/build/mk/OptionalObsoleteFiles.inc
>@@ -591,13 +591,16 @@ OLD_FILES+=usr/share/man/man1/ctm_smail.1.gz
> OLD_FILES+=usr/share/man/man5/ctm.5.gz
> .endif
> 
>-# devd(8) and gperf(1) not listed here on purpose
>+# devd(8) not listed here on purpose
> .if ${MK_CXX} == no
> OLD_FILES+=usr/bin/CC
> OLD_FILES+=usr/bin/c++
> OLD_FILES+=usr/bin/c++filt
> OLD_FILES+=usr/bin/g++
> OLD_FILES+=usr/libexec/cc1plus
>+.if ${MK_GCC} == no
>+OLD_FILES+=usr/bin/gperf
>+.endif
> .endif
> 
> .if ${MK_FMTREE} == no

Actions: View | Diff

Attachments on bug 194103: 147922