diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
| commit | 98e0ffaefb0f241cda3a72395d3be04192ae0d47 (patch) | |
| tree | 55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /lib/libc++ | |
| parent | b17ff922d4072ae132ece458f5b5d74a236880ac (diff) | |
| parent | e81032ad243db32b8fd615b2d55ee94b9f6a5b6a (diff) | |
Notes
Diffstat (limited to 'lib/libc++')
| -rw-r--r-- | lib/libc++/Makefile | 16 | ||||
| -rw-r--r-- | lib/libc++/Makefile.depend | 1 |
2 files changed, 12 insertions, 5 deletions
diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile index e55cf55a5d8f..469ee472f500 100644 --- a/lib/libc++/Makefile +++ b/lib/libc++/Makefile @@ -62,8 +62,7 @@ CFLAGS+= -I${HDRDIR} -I${LIBCXXRTDIR} -nostdlib -DLIBCXXRT CXXFLAGS+= -std=c++11 .endif -DPADD= ${LIBCXXRT} -LDADD= -lcxxrt +LIBADD+= cxxrt LDFLAGS+= --verbose INCSGROUPS= STD EXP EXT @@ -76,6 +75,7 @@ STD_HEADERS= __bit_reference\ __hash_table\ __locale\ __mutex_base\ + __refstring\ __split_buffer\ __sso_allocator\ __std_stream\ @@ -177,8 +177,12 @@ STD+= ${LIBCXXRTDIR}/${hdr} .endfor STDDIR= ${CXXINCLUDEDIR} -EXP_HEADERS= dynarray\ - optional +EXP_HEADERS= __config\ + dynarray\ + optional\ + string_view\ + type_traits\ + utility .for hdr in ${EXP_HEADERS} EXP+= ${HDRDIR}/experimental/${hdr} @@ -204,4 +208,8 @@ 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 e391c404ef63..83e9e6a005e4 100644 --- a/lib/libc++/Makefile.depend +++ b/lib/libc++/Makefile.depend @@ -10,7 +10,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libcxxrt \ lib/msun \ |