diff options
author | emaste <emaste@FreeBSD.org> | 2014-10-09 23:05:31 +0000 |
---|---|---|
committer | emaste <emaste@FreeBSD.org> | 2014-10-09 23:05:31 +0000 |
commit | d00756463cd6ef08e7bad7b7833add551b732ec8 (patch) | |
tree | 24320d1eb9858e4c818b711b7d5127b1d1d29a61 | |
parent | 48a659a54cdcaf8e3749cbba0f01eb7b32377635 (diff) | |
download | FreeBSD-src-d00756463cd6ef08e7bad7b7833add551b732ec8.zip FreeBSD-src-d00756463cd6ef08e7bad7b7833add551b732ec8.tar.gz |
Build gperf only if we're using g++ (not clang++)
gperf is used as a build tool for g++ and is not needed for Clang
architectures. Ports and third-party software that need it can use the
up-to-date devel/gperf port.
PR: 194103 (exp-run)
Reviewed by: bapt
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D886
-rw-r--r-- | UPDATING | 5 | ||||
-rw-r--r-- | gnu/usr.bin/Makefile | 2 | ||||
-rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 7 |
3 files changed, 13 insertions, 1 deletions
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW: disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20141009: + gperf has been removed from the base system for architectures + that use clang. Ports that require gperf will obtain it from the + devel/gperf port. + 20140923: pjdfstest has been moved from tools/regression/pjdfstest to contrib/pjdfstest . 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 a12775b8b..d0fd1d8 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -591,13 +591,18 @@ 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 +OLD_FILES+=usr/share/info/gperf.info.gz +OLD_FILES+=usr/share/man/man1/gperf.1.gz +.endif .endif .if ${MK_FMTREE} == no |