From 9f00530da64d5ed128c35ecdbd7714787fe4ba1a Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Sat, 14 Sep 2013 22:09:10 +0000 Subject: [PATCH] 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) --- tools/build/mk/OptionalObsoleteFiles.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 036aa5f97b3..3ea2f575d2c 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