From owner-svn-src-all@FreeBSD.ORG  Sat Nov 26 03:26:07 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7C7881065690;
	Sat, 26 Nov 2011 03:26:07 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 531398FC13;
	Sat, 26 Nov 2011 03:26:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAQ3Q7OA071786;
	Sat, 26 Nov 2011 03:26:07 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAQ3Q7Qw071782;
	Sat, 26 Nov 2011 03:26:07 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201111260326.pAQ3Q7Qw071782@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 26 Nov 2011 03:26:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227987 - in head: . lib share/mk
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Nov 2011 03:26:07 -0000

Author: dim
Date: Sat Nov 26 03:26:06 2011
New Revision: 227987
URL: http://svn.freebsd.org/changeset/base/227987

Log:
  Fix breakage after r227983; lib/libcxxrt still got built, because it was
  not disabled in the usual way (by adding it to __DEFAULT_NO_OPTIONS in
  share/mk/bsd.own.mk), and because the test for MK_LIBCPLUSPLUS in
  Makefile.inc1 was incorrect.
  
  Pointy hat to:	dim

Modified:
  head/Makefile.inc1
  head/lib/Makefile
  head/share/mk/bsd.own.mk

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Sat Nov 26 01:44:37 2011	(r227986)
+++ head/Makefile.inc1	Sat Nov 26 03:26:06 2011	(r227987)
@@ -1218,7 +1218,7 @@ _startup_libs+=	lib/csu/${MACHINE_CPUARC
 _startup_libs+=	gnu/lib/libgcc
 _startup_libs+=	lib/libcompiler_rt
 _startup_libs+=	lib/libc
-.if defined(MK_LIBCPLUSPLUS)
+.if ${MK_LIBCPLUSPLUS} != "no"
 _startup_libs+=	lib/libcxxrt
 .endif
 

Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile	Sat Nov 26 01:44:37 2011	(r227986)
+++ head/lib/Makefile	Sat Nov 26 03:26:06 2011	(r227987)
@@ -48,13 +48,9 @@ SUBDIR_ORDERED=	${_csu} \
 	libsbuf \
 	libtacplus \
 	libutil \
-	${_libypclnt}
-
-.if ${MK_LIBCPLUSPLUS} != "no"
-SUBDIR_ORDERED+=libcxxrt\
-	libc++
-.endif
-
+	${_libypclnt} \
+	${_libcxxrt} \
+	${_libcplusplus}
 
 SUBDIR=	${SUBDIR_ORDERED} \
 	libalias \
@@ -209,6 +205,11 @@ _libsmb=	libsmb
 _libmp=		libmp
 .endif
 
+.if ${MK_LIBCPLUSPLUS} != "no"
+_libcxxrt=	libcxxrt
+_libcplusplus=	libc++
+.endif
+
 .if ${MK_PMC} != "no"
 _libpmc=	libpmc
 .endif

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Sat Nov 26 01:44:37 2011	(r227986)
+++ head/share/mk/bsd.own.mk	Sat Nov 26 03:26:06 2011	(r227987)
@@ -413,6 +413,7 @@ __DEFAULT_NO_OPTIONS = \
     HESIOD \
     ICONV \
     IDEA \
+    LIBCPLUSPLUS \
     OFED
 
 #
@@ -553,8 +554,6 @@ MK_GCC:=	no
 MK_GDB:=	no
 .endif
 
-MK_LIBCPLUSPLUS?= no
-
 #
 # Set defaults for the MK_*_SUPPORT variables.
 #