diff options
author | des <des@FreeBSD.org> | 2013-09-09 21:18:16 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2013-09-09 21:18:16 +0000 |
commit | 980d9d1fc0bf3e302c44772111a4c1edeaeb55e6 (patch) | |
tree | eff6b0c5f0fea123ca2b74befe6d80f32f42b974 | |
parent | 504259487c661af075cec8eecf4c7b1362182f0f (diff) | |
download | FreeBSD-src-980d9d1fc0bf3e302c44772111a4c1edeaeb55e6.zip FreeBSD-src-980d9d1fc0bf3e302c44772111a4c1edeaeb55e6.tar.gz |
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)
-rw-r--r-- | share/mk/bsd.prog.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 12f14cb..22ddfb5 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -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} |