From owner-svn-src-all@FreeBSD.ORG  Sat Sep 14 22:09:10 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id CA768938;
 Sat, 14 Sep 2013 22:09:10 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B84682DD8;
 Sat, 14 Sep 2013 22:09:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8EM9AMx009386;
 Sat, 14 Sep 2013 22:09:10 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8EM9AIX009385;
 Sat, 14 Sep 2013 22:09:10 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201309142209.r8EM9AIX009385@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Sat, 14 Sep 2013 22:09:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255576 - head/tools/build/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Sep 2013 22:09:10 -0000

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