svn commit: r255431 - head/share/mk

[Dag-Erling Smørgrav]

Author: des
Date: Mon Sep  9 21:18:16 2013
New Revision: 255431
URL: http://svnweb.freebsd.org/changeset/base/255431

Log:
  Emit the correct standard library dependency line for C++ programs.  In
  the CLANG_IS_CC case, the default is now libc++.  Only use libstdc++ if
  !CLANG_IS_CC or it was explicitly requested in CXXFLAGS.
  
  Submitted by:	theraven
  Approved by:	re (gjb)

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

Modified: head/share/mk/bsd.prog.mk
==============================================================================
--- head/share/mk/bsd.prog.mk	Mon Sep  9 21:05:01 2013	(r255430)
+++ head/share/mk/bsd.prog.mk	Mon Sep  9 21:18:16 2013	(r255431)
@@ -173,7 +173,7 @@ _EXTRADEPEND:
 .else
 	echo ${PROG}: ${LIBC} ${DPADD} >> ${DEPENDFILE}
 .if defined(PROG_CXX)
-.if !empty(CXXFLAGS:M-stdlib=libc++)
+.if ${MK_CLANG_IS_CC} != "no" && empty(CXXFLAGS:M-stdlib=libstdc++)
 	echo ${PROG}: ${LIBCPLUSPLUS} >> ${DEPENDFILE}
 .else
 	echo ${PROG}: ${LIBSTDCPLUSPLUS} >> ${DEPENDFILE}