diff options
| author | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
| commit | 65145fa4c81da358fcbc3b650156dab705dfa34e (patch) | |
| tree | 55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /lib/libc++ | |
| parent | 60ff4eb0dff94a04d75d0d52a3957aaaf5f8c693 (diff) | |
| parent | e6b664c390af88d4a87208bc042ce503da664c3b (diff) | |
| download | FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.zip FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.tar.gz | |
Merge sync of head
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 e55cf55..469ee47 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 e391c40..83e9e6a 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 \ |
