From owner-svn-src-stable-9@FreeBSD.ORG  Thu Nov  7 20:54:52 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@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 BC85C680;
 Thu,  7 Nov 2013 20:54:52 +0000 (UTC) (envelope-from dim@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 A9EDB2D5E;
 Thu,  7 Nov 2013 20:54:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA7KsqOG053016;
 Thu, 7 Nov 2013 20:54:52 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA7KsqN0053015;
 Thu, 7 Nov 2013 20:54:52 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201311072054.rA7KsqN0053015@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 7 Nov 2013 20:54:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r257812 - stable/9/share/mk
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Nov 2013 20:54:52 -0000

Author: dim
Date: Thu Nov  7 20:54:52 2013
New Revision: 257812
URL: http://svnweb.freebsd.org/changeset/base/257812

Log:
  MFC r257658:
  
  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.

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

Modified: stable/9/share/mk/bsd.prog.mk
==============================================================================
--- stable/9/share/mk/bsd.prog.mk	Thu Nov  7 20:45:50 2013	(r257811)
+++ stable/9/share/mk/bsd.prog.mk	Thu Nov  7 20:54:52 2013	(r257812)
@@ -168,7 +168,7 @@ _EXTRADEPEND:
 .endif
 .else
 	echo ${PROG}: ${LIBC} ${DPADD} >> ${DEPENDFILE}
-.if defined(PROG_CXX)
+.if defined(PROG_CXX) && !defined(EARLY_BUILD)
 .if !empty(CXXFLAGS:M-stdlib=libc++)
 	echo ${PROG}: ${LIBCPLUSPLUS} >> ${DEPENDFILE}
 .else