Update build glue for building libc++.

This commit is contained in:
Dimitry Andric 2019-08-28 20:05:55 +00:00
parent a32f82c2c1
commit b0d4288fb1
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/projects/clang900-import/; revision=351578
4 changed files with 17 additions and 39 deletions

View File

@ -38,6 +38,17 @@
# xargs -n1 | sort | uniq -d;
# done
# 2019mmdd: libc++ 9.0.0 removed some experimental files
OLD_FILES+=usr/include/c++/v1/experimental/any
OLD_FILES+=usr/include/c++/v1/experimental/chrono
OLD_FILES+=usr/include/c++/v1/experimental/numeric
OLD_FILES+=usr/include/c++/v1/experimental/optional
OLD_FILES+=usr/include/c++/v1/experimental/ratio
OLD_FILES+=usr/include/c++/v1/experimental/string_view
OLD_FILES+=usr/include/c++/v1/experimental/system_error
OLD_FILES+=usr/include/c++/v1/experimental/tuple
OLD_FILES+=usr/lib/libc++fs.a
# 20190817: pft_ping.py and sniffer.py moved to /usr/tests/sys/netpfil/common
OLD_FILES+=usr/tests/sys/netpfil/pf/sniffer.py
OLD_FILES+=usr/tests/sys/netpfil/pf/pft_ping.py

View File

@ -166,7 +166,6 @@ _libclang_rt= libclang_rt
_libcxxrt= libcxxrt
_libcplusplus= libc++
_libcplusplus+= libc++experimental
_libcplusplus+= libc++fs
.endif
SUBDIR.${MK_EFI}+= libefivar

View File

@ -23,8 +23,12 @@ SRCS+= bind.cpp
SRCS+= charconv.cpp
SRCS+= chrono.cpp
SRCS+= condition_variable.cpp
SRCS+= condition_variable_destructor.cpp
SRCS+= debug.cpp
SRCS+= exception.cpp
SRCS+= filesystem/directory_iterator.cpp
SRCS+= filesystem/int128_builtins.cpp
SRCS+= filesystem/operations.cpp
SRCS+= functional.cpp
SRCS+= future.cpp
SRCS+= hash.cpp
@ -33,6 +37,7 @@ SRCS+= iostream.cpp
SRCS+= locale.cpp
SRCS+= memory.cpp
SRCS+= mutex.cpp
SRCS+= mutex_destructor.cpp
SRCS+= new.cpp
SRCS+= optional.cpp
SRCS+= random.cpp
@ -48,9 +53,6 @@ SRCS+= utility.cpp
SRCS+= valarray.cpp
SRCS+= variant.cpp
SRCS+= vector.cpp
SRCS+= filesystem/directory_iterator.cpp
SRCS+= filesystem/int128_builtins.cpp
SRCS+= filesystem/operations.cpp
CXXRT_SRCS+= auxhelper.cc
CXXRT_SRCS+= dynamic_cast.cc
@ -145,6 +147,7 @@ STD_HEADERS+= cwctype
STD_HEADERS+= deque
STD_HEADERS+= errno.h
STD_HEADERS+= exception
STD_HEADERS+= fenv.h
STD_HEADERS+= filesystem
STD_HEADERS+= float.h
STD_HEADERS+= forward_list
@ -228,8 +231,6 @@ STDDIR= ${CXXINCLUDEDIR}
EXP_HEADERS+= __config
EXP_HEADERS+= __memory
EXP_HEADERS+= algorithm
EXP_HEADERS+= any
EXP_HEADERS+= chrono
EXP_HEADERS+= coroutine
EXP_HEADERS+= deque
EXP_HEADERS+= filesystem
@ -239,17 +240,11 @@ EXP_HEADERS+= iterator
EXP_HEADERS+= list
EXP_HEADERS+= map
EXP_HEADERS+= memory_resource
EXP_HEADERS+= numeric
EXP_HEADERS+= optional
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
EXP_HEADERS+= tuple
EXP_HEADERS+= type_traits
EXP_HEADERS+= unordered_map
EXP_HEADERS+= unordered_set

View File

@ -1,27 +0,0 @@
# $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
CXXSTD?= c++14
.include <bsd.lib.mk>