summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2013-11-04 21:54:56 +0000
committerdim <dim@FreeBSD.org>2013-11-04 21:54:56 +0000
commitfca50c96f29736e66f63356836d199a1295b48ed (patch)
treedd53be8fb9d0efd1f46897e075f5f792fa0663cb
parent3d7ba62a0b4845b99caad9ee1a5ae91d1d870d36 (diff)
downloadFreeBSD-src-fca50c96f29736e66f63356836d199a1295b48ed.zip
FreeBSD-src-fca50c96f29736e66f63356836d199a1295b48ed.tar.gz
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
-rw-r--r--share/mk/bsd.prog.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 22ddfb5..2c196d6 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
OpenPOWER on IntegriCloud