aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorEd Schouten <ed@FreeBSD.org>2013-09-14 22:09:10 +0000
committerEd Schouten <ed@FreeBSD.org>2013-09-14 22:09:10 +0000
commit9f00530da64d5ed128c35ecdbd7714787fe4ba1a (patch)
treebecf0b95e1bf0849f25459b3e3e0d8363fcad3c2 /tools
parent33e1779ab82ce0aed6f05d53a47f102c522a6d9d (diff)
downloadsrc-9f00530da64d5ed128c35ecdbd7714787fe4ba1a.tar.gz
src-9f00530da64d5ed128c35ecdbd7714787fe4ba1a.zip
Properly remove c++filt.
The c++filt binary is only installed if ${MK_GCC} == yes && ${MK_CXX} == yes. This means that it should be removed if ${MK_GCC} == no || ${MK_CXX} == no. In its current form, it actually uses a conjunction instead of a disjunction. As there is already a separate block for ${MK_CXX} == no listing c++filt, simply remove the conditional entirely. Approved by: re (gjb)
Notes
Notes: svn path=/head/; revision=255576
Diffstat (limited to 'tools')
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc2
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 036aa5f97b32..3ea2f575d2cf 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1562,9 +1562,7 @@ OLD_FILES+=usr/share/man/man8/unstr.8.gz
.endif
.if ${MK_GCC} == no
-.if ${MK_CXX} == no
OLD_FILES+=usr/bin/c++filt
-.endif
OLD_FILES+=usr/bin/g++
OLD_FILES+=usr/bin/gcc
OLD_FILES+=usr/bin/gcov