svn commit: r271742 - stable/7/share/mk

[Dimitry Andric]

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