svn commit: r291550 - head/lib/libc++

Bryan Drewery bdrewery at FreeBSD.org
Tue Dec 1 01:22:11 UTC 2015


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 \
 
 


More information about the svn-src-all mailing list