summaryrefslogtreecommitdiffstats
path: root/tools/build
diff options
context:
space:
mode:
authored <ed@FreeBSD.org>2013-09-14 22:09:10 +0000
committered <ed@FreeBSD.org>2013-09-14 22:09:10 +0000
commit2f70e45a585f3e7be1b3af4b165ecef0fc5086ff (patch)
treebecf0b95e1bf0849f25459b3e3e0d8363fcad3c2 /tools/build
parent44f767ab70d93c06c0772ae4c9e5e99a280edf05 (diff)
downloadFreeBSD-src-2f70e45a585f3e7be1b3af4b165ecef0fc5086ff.zip
FreeBSD-src-2f70e45a585f3e7be1b3af4b165ecef0fc5086ff.tar.gz
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)
Diffstat (limited to 'tools/build')
-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 036aa5f..3ea2f57 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
OpenPOWER on IntegriCloud