1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-30 12:04:07 +00:00

Vendor import of libc++ release_70 branch r340910:

https://llvm.org/svn/llvm-project/libcxx/branches/release_70@340910
This commit is contained in:
Dimitry Andric 2018-08-29 17:51:01 +00:00
parent 8ad8b454b4
commit e0095a7644
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/vendor/libc++/dist-release_70/; revision=338384
svn path=/vendor/libc++/libc++-release_70-r340910/; revision=338385; tag=vendor/libc++/libc++-release_70-r340910
2 changed files with 8 additions and 2 deletions

View File

@ -26,7 +26,8 @@ _LIBCPP_BEGIN_NAMESPACE_STD
#if _LIBCPP_STD_VER > 14
#define __cpp_lib_node_extract 201606L
// FIXME: Uncomment this when we support the 'merge' functionality.
// #define __cpp_lib_node_extract 201606L
// Specialized in __tree & __hash_table for their _NodeType.
template <class _NodeType, class _Alloc>

View File

@ -222,12 +222,17 @@ def add_cxx_link_flags(self, flags):
self.full_config.config.available_features)
llvm_unwinder = self.full_config.get_lit_bool('llvm_unwinder', False)
shared_libcxx = self.full_config.get_lit_bool('enable_shared', True)
# FIXME: Remove the need to link -lrt in all the tests, and instead
# limit it only to the filesystem tests. This ensures we don't cause an
# implicit dependency on librt except when filesystem is needed.
enable_fs = self.full_config.get_lit_bool('enable_filesystem',
default=False)
flags += ['-lm']
if not llvm_unwinder:
flags += ['-lgcc_s', '-lgcc']
if enable_threads:
flags += ['-lpthread']
if not shared_libcxx:
if not shared_libcxx or enable_fs:
flags += ['-lrt']
flags += ['-lc']
if llvm_unwinder: