svn commit: r243511 - stable/9/share/mk

Dimitry Andric dim at FreeBSD.org
Sun Nov 25 12:27:20 UTC 2012


Author: dim
Date: Sun Nov 25 12:27:19 2012
New Revision: 243511
URL: http://svnweb.freebsd.org/changeset/base/243511

Log:
  MFC r243348:
  
  Do not expose LIBCXXRT and LIBCPLUSPLUS in bsd.libnames.mk, if
  WITHOUT_LIBCPLUSPLUS is specified.
  
  Submitted by:	Garrett Cooper <yanegomi at gmail.com>

Modified:
  stable/9/share/mk/bsd.libnames.mk
Directory Properties:
  stable/9/share/mk/   (props changed)

Modified: stable/9/share/mk/bsd.libnames.mk
==============================================================================
--- stable/9/share/mk/bsd.libnames.mk	Sun Nov 25 12:19:17 2012	(r243510)
+++ stable/9/share/mk/bsd.libnames.mk	Sun Nov 25 12:27:19 2012	(r243511)
@@ -26,8 +26,10 @@ LIBBSDXML?=	${DESTDIR}${LIBDIR}/libbsdxm
 LIBBSM?=	${DESTDIR}${LIBDIR}/libbsm.a
 LIBBSNMP?=	${DESTDIR}${LIBDIR}/libbsnmp.a
 LIBBZ2?=	${DESTDIR}${LIBDIR}/libbz2.a
+.if ${MK_LIBCPLUSPLUS} != "no"
 LIBCXXRT?=	${DESTDIR}${LIBDIR}/libcxxrt.a
 LIBCPLUSPLUS?=	${DESTDIR}${LIBDIR}/libc++.a
+.endif
 LIBC?=		${DESTDIR}${LIBDIR}/libc.a
 LIBC_PIC?=	${DESTDIR}${LIBDIR}/libc_pic.a
 LIBCALENDAR?=	${DESTDIR}${LIBDIR}/libcalendar.a


More information about the svn-src-stable-9 mailing list