From 756950a1483a3d2d4d1a31876bf7d2fd460d68e4 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Mon, 4 Nov 2013 21:54:56 +0000 Subject: [PATCH] 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 --- share/mk/bsd.prog.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 22ddfb538435..2c196d612c1e 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -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