diff options
| author | sjg <sjg@FreeBSD.org> | 2014-04-27 08:13:43 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2014-04-27 08:13:43 +0000 |
| commit | 0c7e03a54c8e7ddc9c3fe710f83d9ca53173692e (patch) | |
| tree | b92e741b68057a24e381faa9809f32030d65574c /lib/libc++ | |
| parent | c244fcbcaa61dc2a15995e7dbdf3ae8107bc2111 (diff) | |
| parent | 69c3e6933b6946c49fe99b19986f018d71621980 (diff) | |
| download | FreeBSD-src-0c7e03a54c8e7ddc9c3fe710f83d9ca53173692e.zip FreeBSD-src-0c7e03a54c8e7ddc9c3fe710f83d9ca53173692e.tar.gz | |
Merge head
Diffstat (limited to 'lib/libc++')
| -rw-r--r-- | lib/libc++/Makefile | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile index 567144a..1e7dfaf 100644 --- a/lib/libc++/Makefile +++ b/lib/libc++/Makefile @@ -25,8 +25,10 @@ SRCS+= algorithm.cpp\ memory.cpp\ mutex.cpp\ new.cpp\ + optional.cpp\ random.cpp\ regex.cpp\ + shared_mutex.cpp\ stdexcept.cpp\ string.cpp\ strstream.cpp\ @@ -61,7 +63,7 @@ CXXFLAGS+= -std=c++0x DPADD= ${LIBCXXRT} LDADD= -lcxxrt LDFLAGS+= --verbose -INCSGROUPS= STD EXT +INCSGROUPS= STD EXP EXT STD_HEADERS= __bit_reference\ __config\ @@ -140,6 +142,7 @@ STD_HEADERS= __bit_reference\ regex\ scoped_allocator\ set\ + shared_mutex\ sstream\ stack\ stdexcept\ @@ -172,6 +175,14 @@ STD+= ${LIBCXXRTDIR}/${hdr} .endfor STDDIR= ${CXXINCLUDEDIR} +EXP_HEADERS= dynarray\ + optional + +.for hdr in ${EXP_HEADERS} +EXP+= ${HDRDIR}/experimental/${hdr} +.endfor +EXPDIR= ${CXXINCLUDEDIR}/experimental + EXT_HEADERS= __hash\ hash_map\ hash_set |
