svn commit: r257658 - head/share/mk

[Dimitry Andric]

Author: dim
Date: Mon Nov  4 21:54:56 2013
New Revision: 257658
URL: http://svnweb.freebsd.org/changeset/base/257658

Log:
  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.
  
  X-MFC-With:	255431
  MFC after:	3 days

Modified:
  head/share/mk/bsd.prog.mk

Modified: head/share/mk/bsd.prog.mk
==============================================================================
--- head/share/mk/bsd.prog.mk	Mon Nov  4 21:32:07 2013	(r257657)
+++ head/share/mk/bsd.prog.mk	Mon Nov  4 21:54:56 2013	(r257658)
@@ -172,7 +172,7 @@ _EXTRADEPEND:
 .endif
 .else
 	echo ${PROG}: ${LIBC} ${DPADD} >> ${DEPENDFILE}
-.if defined(PROG_CXX)
+.if defined(PROG_CXX) && !defined(EARLY_BUILD)
 .if ${MK_CLANG_IS_CC} != "no" && empty(CXXFLAGS:M-stdlib=libstdc++)
 	echo ${PROG}: ${LIBCPLUSPLUS} >> ${DEPENDFILE}
 .else