svn commit: r255576 - head/tools/build/mk

[Ed Schouten]

Author: ed
Date: Sat Sep 14 22:09:10 2013
New Revision: 255576
URL: http://svnweb.freebsd.org/changeset/base/255576

Log:
  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)

Modified:
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Sat Sep 14 21:43:18 2013	(r255575)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Sat Sep 14 22:09:10 2013	(r255576)
@@ -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