aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2018-08-02 18:24:03 +0000
committerDimitry Andric <dim@FreeBSD.org>2018-08-02 18:24:03 +0000
commit488aa40ab024a83e64a0c8cd9db7ba55e182a718 (patch)
tree7d2a6992c49d682b79277ea2a4a41659d4b48b77 /lib
parent0fecf00141569f7875943b2efde55ebf710fb021 (diff)
Notes
Diffstat (limited to 'lib')
-rw-r--r--lib/libc++/Makefile9
-rw-r--r--lib/libc++experimental/Makefile3
-rw-r--r--lib/libc++fs/Makefile29
3 files changed, 38 insertions, 3 deletions
diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile
index db2d3144f901..74975b2fe33d 100644
--- a/lib/libc++/Makefile
+++ b/lib/libc++/Makefile
@@ -20,6 +20,7 @@ SHLIB_LDSCRIPT= libc++.ldscript
SRCS+= algorithm.cpp
SRCS+= any.cpp
SRCS+= bind.cpp
+SRCS+= charconv.cpp
SRCS+= chrono.cpp
SRCS+= condition_variable.cpp
SRCS+= debug.cpp
@@ -84,6 +85,7 @@ STD_HEADERS+= __bsd_locale_defaults.h
STD_HEADERS+= __bsd_locale_fallbacks.h
STD_HEADERS+= __config
STD_HEADERS+= __debug
+STD_HEADERS+= __errc
STD_HEADERS+= __functional_03
STD_HEADERS+= __functional_base
STD_HEADERS+= __functional_base_03
@@ -91,6 +93,7 @@ STD_HEADERS+= __hash_table
STD_HEADERS+= __libcpp_version
STD_HEADERS+= __locale
STD_HEADERS+= __mutex_base
+STD_HEADERS+= __node_handle
STD_HEADERS+= __nullptr
STD_HEADERS+= __split_buffer
STD_HEADERS+= __sso_allocator
@@ -111,6 +114,7 @@ STD_HEADERS+= cctype
STD_HEADERS+= cerrno
STD_HEADERS+= cfenv
STD_HEADERS+= cfloat
+STD_HEADERS+= charconv
STD_HEADERS+= chrono
STD_HEADERS+= cinttypes
STD_HEADERS+= ciso646
@@ -118,6 +122,7 @@ STD_HEADERS+= climits
STD_HEADERS+= clocale
STD_HEADERS+= cmath
STD_HEADERS+= codecvt
+STD_HEADERS+= compare
STD_HEADERS+= complex
STD_HEADERS+= complex.h
STD_HEADERS+= condition_variable
@@ -138,6 +143,7 @@ STD_HEADERS+= cwctype
STD_HEADERS+= deque
STD_HEADERS+= errno.h
STD_HEADERS+= exception
+STD_HEADERS+= filesystem
STD_HEADERS+= float.h
STD_HEADERS+= forward_list
STD_HEADERS+= fstream
@@ -172,6 +178,7 @@ STD_HEADERS+= scoped_allocator
STD_HEADERS+= set
STD_HEADERS+= setjmp.h
STD_HEADERS+= shared_mutex
+STD_HEADERS+= span
STD_HEADERS+= sstream
STD_HEADERS+= stack
STD_HEADERS+= stdbool.h
@@ -198,6 +205,7 @@ STD_HEADERS+= utility
STD_HEADERS+= valarray
STD_HEADERS+= variant
STD_HEADERS+= vector
+STD_HEADERS+= version
STD_HEADERS+= wchar.h
STD_HEADERS+= wctype.h
@@ -236,6 +244,7 @@ EXP_HEADERS+= propagate_const
EXP_HEADERS+= ratio
EXP_HEADERS+= regex
EXP_HEADERS+= set
+EXP_HEADERS+= simd
EXP_HEADERS+= string
EXP_HEADERS+= string_view
EXP_HEADERS+= system_error
diff --git a/lib/libc++experimental/Makefile b/lib/libc++experimental/Makefile
index e2563cc5cd1f..8d1e4b58bbe2 100644
--- a/lib/libc++experimental/Makefile
+++ b/lib/libc++experimental/Makefile
@@ -11,9 +11,6 @@ MK_PROFILE= no
.PATH: ${SRCDIR}/src/experimental
-SRCS+= filesystem/directory_iterator.cpp
-SRCS+= filesystem/operations.cpp
-SRCS+= filesystem/path.cpp
SRCS+= memory_resource.cpp
WARNS?= 0
diff --git a/lib/libc++fs/Makefile b/lib/libc++fs/Makefile
new file mode 100644
index 000000000000..a89c5d6821d4
--- /dev/null
+++ b/lib/libc++fs/Makefile
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+.include <src.opts.mk>
+
+PACKAGE= clibs
+SRCDIR= ${SRCTOP}/contrib/libc++
+
+LIB= c++fs
+NO_PIC=
+MK_PROFILE= no
+
+.PATH: ${SRCDIR}/src/filesystem
+
+SRCS+= directory_iterator.cpp
+SRCS+= int128_builtins.cpp
+SRCS+= operations.cpp
+
+WARNS?= 0
+CXXFLAGS+= ${PICFLAG}
+CXXFLAGS+= -isystem ${SRCDIR}/include
+CXXFLAGS+= -nostdinc++
+CXXFLAGS+= -nostdlib
+CXXFLAGS+= -D_LIBCPP_BUILDING_LIBRARY
+CXXFLAGS+= -DLIBCXXRT
+.if empty(CXXFLAGS:M-std=*)
+CXXFLAGS+= -std=c++14
+.endif
+
+.include <bsd.lib.mk>