From owner-svn-src-head@freebsd.org  Tue Dec  1 01:22:11 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A1058A3D097;
 Tue,  1 Dec 2015 01:22:11 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6DCEE10C2;
 Tue,  1 Dec 2015 01:22:11 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB11MAlg037680;
 Tue, 1 Dec 2015 01:22:10 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB11MALE037678;
 Tue, 1 Dec 2015 01:22:10 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201512010122.tB11MALE037678@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 1 Dec 2015 01:22:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r291550 - head/lib/libc++
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Dec 2015 01:22:11 -0000

Author: bdrewery
Date: Tue Dec  1 01:22:10 2015
New Revision: 291550
URL: https://svnweb.freebsd.org/changeset/base/291550

Log:
  META MODE: Libc++ does in fact need Libcxxrt.
  
  There seems to be no cyclic dependency here.  This partially reverts r283595
  which had no explanation for the change.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/lib/libc++/Makefile
  head/lib/libc++/Makefile.depend

Modified: head/lib/libc++/Makefile
==============================================================================
--- head/lib/libc++/Makefile	Tue Dec  1 00:53:17 2015	(r291549)
+++ head/lib/libc++/Makefile	Tue Dec  1 01:22:10 2015	(r291550)
@@ -212,8 +212,4 @@ afterinstall:
 		${.OBJDIR}/libstdc++.a
 .endif
 
-# avoid cyclic dependency
-CFLAGS+= -I${LIBCXXRTDIR}
-GENDIRDEPS_FILTER= N*/libcxxrt
-
 .include <bsd.lib.mk>

Modified: head/lib/libc++/Makefile.depend
==============================================================================
--- head/lib/libc++/Makefile.depend	Tue Dec  1 00:53:17 2015	(r291549)
+++ head/lib/libc++/Makefile.depend	Tue Dec  1 01:22:10 2015	(r291550)
@@ -9,6 +9,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libcxxrt \
 	lib/msun \