Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 20 Nov 2012 21:26:13 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r243348 - head/share/mk
Message-ID:  <201211202126.qAKLQDoS097129@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dim
Date: Tue Nov 20 21:26:13 2012
New Revision: 243348
URL: http://svnweb.freebsd.org/changeset/base/243348

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

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

Modified: head/share/mk/bsd.libnames.mk
==============================================================================
--- head/share/mk/bsd.libnames.mk	Tue Nov 20 21:01:59 2012	(r243347)
+++ head/share/mk/bsd.libnames.mk	Tue Nov 20 21:26:13 2012	(r243348)
@@ -28,8 +28,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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211202126.qAKLQDoS097129>