summaryrefslogtreecommitdiffstats
path: root/lib/libc++
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2015-12-01 01:22:10 +0000
committerbdrewery <bdrewery@FreeBSD.org>2015-12-01 01:22:10 +0000
commitebd53e9f44c7a0afa06cd18c370490176264c038 (patch)
tree6988bc6e84daf0fdbfb454673c099fe8444571df /lib/libc++
parentad1f06e3925bdd3db070a9ed6cae24a70ee35d4f (diff)
downloadFreeBSD-src-ebd53e9f44c7a0afa06cd18c370490176264c038.zip
FreeBSD-src-ebd53e9f44c7a0afa06cd18c370490176264c038.tar.gz
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
Diffstat (limited to 'lib/libc++')
-rw-r--r--lib/libc++/Makefile4
-rw-r--r--lib/libc++/Makefile.depend1
2 files changed, 1 insertions, 4 deletions
diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile
index d9b0360..a249be9 100644
--- a/lib/libc++/Makefile
+++ b/lib/libc++/Makefile
@@ -212,8 +212,4 @@ afterinstall:
${.OBJDIR}/libstdc++.a
.endif
-# avoid cyclic dependency
-CFLAGS+= -I${LIBCXXRTDIR}
-GENDIRDEPS_FILTER= N*/libcxxrt
-
.include <bsd.lib.mk>
diff --git a/lib/libc++/Makefile.depend b/lib/libc++/Makefile.depend
index cb81639..39735a8 100644
--- a/lib/libc++/Makefile.depend
+++ b/lib/libc++/Makefile.depend
@@ -9,6 +9,7 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/libcxxrt \
lib/msun \
OpenPOWER on IntegriCloud