From owner-svn-src-stable-7@FreeBSD.ORG  Thu Sep 18 06:47:48 2014
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@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 ESMTPS id BA4E3325;
 Thu, 18 Sep 2014 06:47:48 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A54F73A0;
 Thu, 18 Sep 2014 06:47:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8I6lm6r045553;
 Thu, 18 Sep 2014 06:47:48 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8I6lmDx045552;
 Thu, 18 Sep 2014 06:47:48 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201409180647.s8I6lmDx045552@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 18 Sep 2014 06:47:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject: svn commit: r271742 - stable/7/share/mk
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
 <svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-7>, 
 <mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7/>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
 <mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Sep 2014 06:47:48 -0000

Author: dim
Date: Thu Sep 18 06:47:48 2014
New Revision: 271742
URL: http://svnweb.freebsd.org/changeset/base/271742

Log:
  MFC r257658 (modified to apply to stable/7):
  
  For C++ programs, don't emit any explicit dependency to libstdc++.a or
  libc++.a during the early build stages (bootstrap-tools, build-tools,
  cross-tools), since it is not possible to know in advance which C++
  library is available on the host system.
  
  Instead, just use the bootstrap compiler's built-in default.  This
  should eventually make it possible to build stable/9 on head, or on
  stable/10, which ship without libstdc++ by default.
  
  [Note: this should get the stable/7 tinderbox at least a bit further in
  buildworld.]

Modified:
  stable/7/share/mk/bsd.prog.mk
Directory Properties:
  stable/7/share/mk/   (props changed)

Modified: stable/7/share/mk/bsd.prog.mk
==============================================================================
--- stable/7/share/mk/bsd.prog.mk	Thu Sep 18 06:45:43 2014	(r271741)
+++ stable/7/share/mk/bsd.prog.mk	Thu Sep 18 06:47:48 2014	(r271742)
@@ -126,7 +126,7 @@ _EXTRADEPEND:
 .endif
 .else
 	echo ${PROG}: ${LIBC} ${DPADD} >> ${DEPENDFILE}
-.if defined(PROG_CXX)
+.if defined(PROG_CXX) && !defined(BOOTSTRAPPING)
 	echo ${PROG}: ${LIBSTDCPLUSPLUS} >> ${DEPENDFILE}
 .endif
 .endif