summaryrefslogtreecommitdiffstats
path: root/lib/libc++
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2014-01-30 07:44:22 +0000
committerdim <dim@FreeBSD.org>2014-01-30 07:44:22 +0000
commit0b319638e352dd16f2e5a243bd3826d37eef1680 (patch)
treeadd3759d4df7ee10d814c3b2561c3c28fcd9cef2 /lib/libc++
parent9cecf9778c1472e916ad20086c11e4bf332ba6ad (diff)
parentc3e10da3dc0f616b78ccf85206fdcf4c92f8ac85 (diff)
downloadFreeBSD-src-0b319638e352dd16f2e5a243bd3826d37eef1680.zip
FreeBSD-src-0b319638e352dd16f2e5a243bd3826d37eef1680.tar.gz
Import libc++ 3.4 release. This contains a lot of bugfixes, and some
preliminary support for C++1y. MFC after: 3 weeks
Diffstat (limited to 'lib/libc++')
-rw-r--r--lib/libc++/Makefile13
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
OpenPOWER on IntegriCloud