diff options
author | somov <somov@yandex-team.ru> | 2022-02-10 16:45:49 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:45:49 +0300 |
commit | 7489e4682331202b9c7d863c0898eb83d7b12c2b (patch) | |
tree | 9142afc54d335ea52910662635b898e79e192e49 /contrib/libs/cxxsupp/libcxx | |
parent | a5950576e397b1909261050b8c7da16db58f10b1 (diff) | |
download | ydb-7489e4682331202b9c7d863c0898eb83d7b12c2b.tar.gz |
Restoring authorship annotation for <somov@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'contrib/libs/cxxsupp/libcxx')
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/include/__config | 24 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/include/__locale | 2 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/include/__string | 8 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/include/__support/android/locale_bionic.h | 6 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/include/__support/win32/atomic_win32.h | 4 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/include/__tuple | 34 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/include/complex | 4 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/include/cxxabi.h | 4 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/include/span | 20 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/include/unwind.h | 14 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/include/version | 20 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/src/support/runtime/exception_pointer_msvc.ipp | 12 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/ya.make | 60 |
13 files changed, 106 insertions, 106 deletions
diff --git a/contrib/libs/cxxsupp/libcxx/include/__config b/contrib/libs/cxxsupp/libcxx/include/__config index 64c5a00c488..bdc54b92d1e 100644 --- a/contrib/libs/cxxsupp/libcxx/include/__config +++ b/contrib/libs/cxxsupp/libcxx/include/__config @@ -34,16 +34,16 @@ #elif defined(_MSC_VER) #define _LIBCPP_COMPILER_MSVC -#if _MSVC_LANG == 201705L -# define _LIBCPP_STD_VER 20 -#elif _MSVC_LANG == 201703L +#if _MSVC_LANG == 201705L +# define _LIBCPP_STD_VER 20 +#elif _MSVC_LANG == 201703L # define _LIBCPP_STD_VER 17 #else # define _LIBCPP_STD_VER 14 #endif -#define _LIBCPP_UCRT_INCLUDE(x) <Y_UCRT_INCLUDE/x> -#define _LIBCPP_MSVC_INCLUDE(x) <Y_MSVC_INCLUDE/x> +#define _LIBCPP_UCRT_INCLUDE(x) <Y_UCRT_INCLUDE/x> +#define _LIBCPP_MSVC_INCLUDE(x) <Y_MSVC_INCLUDE/x> #elif defined(__IBMCPP__) #define _LIBCPP_COMPILER_IBM #endif @@ -1306,8 +1306,8 @@ extern "C" _LIBCPP_FUNC_VIS void __sanitizer_annotate_contiguous_container( #endif #if defined(_LIBCPP_ABI_MICROSOFT) && \ - (defined(_LIBCPP_COMPILER_MSVC) || __has_declspec_attribute(empty_bases)) && \ - !defined(__CUDACC__) + (defined(_LIBCPP_COMPILER_MSVC) || __has_declspec_attribute(empty_bases)) && \ + !defined(__CUDACC__) # define _LIBCPP_DECLSPEC_EMPTY_BASES __declspec(empty_bases) #else # define _LIBCPP_DECLSPEC_EMPTY_BASES @@ -1336,11 +1336,11 @@ extern "C" _LIBCPP_FUNC_VIS void __sanitizer_annotate_contiguous_container( #define _LIBCPP_HAS_NO_SPACESHIP_OPERATOR #endif -// Yandex-specific: We build our own libc++, so it has everything available -#define _LIBCPP_DISABLE_AVAILABILITY -// End of Yandex-specific - -#if defined(_LIBCPP_COMPILER_IBM) || defined(__CUDACC__) +// Yandex-specific: We build our own libc++, so it has everything available +#define _LIBCPP_DISABLE_AVAILABILITY +// End of Yandex-specific + +#if defined(_LIBCPP_COMPILER_IBM) || defined(__CUDACC__) #define _LIBCPP_HAS_NO_PRAGMA_PUSH_POP_MACRO #endif diff --git a/contrib/libs/cxxsupp/libcxx/include/__locale b/contrib/libs/cxxsupp/libcxx/include/__locale index 3ca06c386a4..38cb7a6f391 100644 --- a/contrib/libs/cxxsupp/libcxx/include/__locale +++ b/contrib/libs/cxxsupp/libcxx/include/__locale @@ -34,7 +34,7 @@ # include <__support/newlib/xlocale.h> #elif defined(__OpenBSD__) # include <__support/openbsd/xlocale.h> -#elif (defined(__APPLE__) || defined(__FreeBSD__) \ +#elif (defined(__APPLE__) || defined(__FreeBSD__) \ || defined(__EMSCRIPTEN__) || defined(__IBMCPP__)) # include <xlocale.h> #elif defined(__Fuchsia__) diff --git a/contrib/libs/cxxsupp/libcxx/include/__string b/contrib/libs/cxxsupp/libcxx/include/__string index 161f7195d00..7074a735386 100644 --- a/contrib/libs/cxxsupp/libcxx/include/__string +++ b/contrib/libs/cxxsupp/libcxx/include/__string @@ -426,7 +426,7 @@ char_traits<char>::find(const char_type* __s, size_t __n, const char_type& __a) { if (__n == 0) return nullptr; -#if __has_feature(cxx_constexpr_string_builtins) && !defined(__CUDACC__) +#if __has_feature(cxx_constexpr_string_builtins) && !defined(__CUDACC__) return __builtin_char_memchr(__s, to_int_type(__a), __n); #elif _LIBCPP_STD_VER <= 14 return (const char_type*) _VSTD::memchr(__s, to_int_type(__a), __n); @@ -509,7 +509,7 @@ char_traits<wchar_t>::compare(const char_type* __s1, const char_type* __s2, size { if (__n == 0) return 0; -#if __has_feature(cxx_constexpr_string_builtins) && !defined(__CUDACC__) +#if __has_feature(cxx_constexpr_string_builtins) && !defined(__CUDACC__) return __builtin_wmemcmp(__s1, __s2, __n); #elif _LIBCPP_STD_VER <= 14 return _VSTD::wmemcmp(__s1, __s2, __n); @@ -529,7 +529,7 @@ inline _LIBCPP_CONSTEXPR_AFTER_CXX14 size_t char_traits<wchar_t>::length(const char_type* __s) _NOEXCEPT { -#if __has_feature(cxx_constexpr_string_builtins) && !defined(__CUDACC__) +#if __has_feature(cxx_constexpr_string_builtins) && !defined(__CUDACC__) return __builtin_wcslen(__s); #elif _LIBCPP_STD_VER <= 14 return _VSTD::wcslen(__s); @@ -547,7 +547,7 @@ char_traits<wchar_t>::find(const char_type* __s, size_t __n, const char_type& __ { if (__n == 0) return nullptr; -#if __has_feature(cxx_constexpr_string_builtins) && !defined(__CUDACC__) +#if __has_feature(cxx_constexpr_string_builtins) && !defined(__CUDACC__) return __builtin_wmemchr(__s, __a, __n); #elif _LIBCPP_STD_VER <= 14 return _VSTD::wmemchr(__s, __a, __n); diff --git a/contrib/libs/cxxsupp/libcxx/include/__support/android/locale_bionic.h b/contrib/libs/cxxsupp/libcxx/include/__support/android/locale_bionic.h index 650683310cf..733eb83642f 100644 --- a/contrib/libs/cxxsupp/libcxx/include/__support/android/locale_bionic.h +++ b/contrib/libs/cxxsupp/libcxx/include/__support/android/locale_bionic.h @@ -26,9 +26,9 @@ extern "C" { #if defined(__ANDROID__) #include <android/api-level.h> -#if defined(__has_include) && __has_include(<android/ndk-version.h>) -# include <android/ndk-version.h> -#endif +#if defined(__has_include) && __has_include(<android/ndk-version.h>) +# include <android/ndk-version.h> +#endif #if __ANDROID_API__ < 21 #include <__support/xlocale/__posix_l_fallback.h> #endif diff --git a/contrib/libs/cxxsupp/libcxx/include/__support/win32/atomic_win32.h b/contrib/libs/cxxsupp/libcxx/include/__support/win32/atomic_win32.h index cc7bdeee63c..e32bcf90735 100644 --- a/contrib/libs/cxxsupp/libcxx/include/__support/win32/atomic_win32.h +++ b/contrib/libs/cxxsupp/libcxx/include/__support/win32/atomic_win32.h @@ -64,9 +64,9 @@ static inline void __c11_atomic_init(_Atomic(_Tp)* __a, _Tp __val) { } static inline void __c11_atomic_thread_fence(int __order) { - if (__order != static_cast<int>(memory_order_relaxed)) { + if (__order != static_cast<int>(memory_order_relaxed)) { #if defined(_M_IX86) || defined(_M_X64) - if (__order == static_cast<int>(memory_order_seq_cst)) { + if (__order == static_cast<int>(memory_order_seq_cst)) { _MemoryBarrier; } else { _ReadWriteBarrier(); diff --git a/contrib/libs/cxxsupp/libcxx/include/__tuple b/contrib/libs/cxxsupp/libcxx/include/__tuple index d52b88497a0..08f4dd5efa4 100644 --- a/contrib/libs/cxxsupp/libcxx/include/__tuple +++ b/contrib/libs/cxxsupp/libcxx/include/__tuple @@ -91,7 +91,7 @@ struct __integer_sequence { using __to_tuple_indices = __tuple_indices<(_Values + _Sp)...>; }; -#if defined(__CUDACC__) || !__has_builtin(__make_integer_seq) || defined(_LIBCPP_TESTING_FALLBACK_MAKE_INTEGER_SEQUENCE) +#if defined(__CUDACC__) || !__has_builtin(__make_integer_seq) || defined(_LIBCPP_TESTING_FALLBACK_MAKE_INTEGER_SEQUENCE) namespace __detail { template<typename _Tp, size_t ..._Extra> struct __repeat; @@ -133,7 +133,7 @@ template<> struct __parity<7> { template<size_t _Np> struct __pmake : __repeat<t #endif // !__has_builtin(__make_integer_seq) || defined(_LIBCPP_TESTING_FALLBACK_MAKE_INTEGER_SEQUENCE) -#if __has_builtin(__make_integer_seq) && !defined(__CUDACC__) +#if __has_builtin(__make_integer_seq) && !defined(__CUDACC__) template <size_t _Ep, size_t _Sp> using __make_indices_imp = typename __make_integer_seq<__integer_sequence, size_t, _Ep - _Sp>::template @@ -264,7 +264,7 @@ __indexed<_Idx, _Tp> __at_index(__indexed<_Idx, _Tp> const&); } // namespace __indexer_detail -#if !defined(__CUDACC__) || !defined(_MSC_VER) +#if !defined(__CUDACC__) || !defined(_MSC_VER) template <size_t _Idx, class ..._Types> using __type_pack_element _LIBCPP_NODEBUG = typename decltype( __indexer_detail::__at_index<_Idx>( @@ -274,20 +274,20 @@ using __type_pack_element _LIBCPP_NODEBUG = typename decltype( >{}) )::type; -#else // !defined(__CUDACC__) || !defined(_MSC_VER) -template <size_t _Idx, class ..._Types> -struct __y_type_pack_element { - using __t1 = typename __make_tuple_indices<sizeof...(_Types)>::type; - using __t2 = __indexer_detail::__indexer<__tuple_types<_Types...>, __t1>; - using __t3 = decltype(__indexer_detail::__at_index<_Idx>(__t2{})); - using __t4 = typename __t3::type; -}; - -template <size_t _Idx, class ..._Types> -using __type_pack_element = typename __y_type_pack_element<_Idx, _Types...>::__t4; - -#endif // !defined(__CUDACC__) || !defined(_MSC_VER) - +#else // !defined(__CUDACC__) || !defined(_MSC_VER) +template <size_t _Idx, class ..._Types> +struct __y_type_pack_element { + using __t1 = typename __make_tuple_indices<sizeof...(_Types)>::type; + using __t2 = __indexer_detail::__indexer<__tuple_types<_Types...>, __t1>; + using __t3 = decltype(__indexer_detail::__at_index<_Idx>(__t2{})); + using __t4 = typename __t3::type; +}; + +template <size_t _Idx, class ..._Types> +using __type_pack_element = typename __y_type_pack_element<_Idx, _Types...>::__t4; + +#endif // !defined(__CUDACC__) || !defined(_MSC_VER) + #endif // __has_builtin(__type_pack_element) template <size_t _Ip, class ..._Types> diff --git a/contrib/libs/cxxsupp/libcxx/include/complex b/contrib/libs/cxxsupp/libcxx/include/complex index 5c44fdbf379..e4c59193bce 100644 --- a/contrib/libs/cxxsupp/libcxx/include/complex +++ b/contrib/libs/cxxsupp/libcxx/include/complex @@ -1475,7 +1475,7 @@ inline namespace literals } -#if !defined(__CUDACC__) +#if !defined(__CUDACC__) constexpr complex<float> operator""if(long double __im) { return { 0.0f, static_cast<float>(__im) }; @@ -1485,7 +1485,7 @@ inline namespace literals { return { 0.0f, static_cast<float>(__im) }; } -#endif +#endif } } #endif diff --git a/contrib/libs/cxxsupp/libcxx/include/cxxabi.h b/contrib/libs/cxxsupp/libcxx/include/cxxabi.h index 155c6c846ba..3b1edaf75ae 100644 --- a/contrib/libs/cxxsupp/libcxx/include/cxxabi.h +++ b/contrib/libs/cxxsupp/libcxx/include/cxxabi.h @@ -1,9 +1,9 @@ #pragma once -#if defined(__IOS__) || defined(__ANDROID__) +#if defined(__IOS__) || defined(__ANDROID__) #include_next <cxxabi.h> #elif defined(_WIN32) // pass #else #include <contrib/libs/cxxsupp/libcxxrt/cxxabi.h> -#endif +#endif diff --git a/contrib/libs/cxxsupp/libcxx/include/span b/contrib/libs/cxxsupp/libcxx/include/span index 1347fb0d648..5d57bd693c5 100644 --- a/contrib/libs/cxxsupp/libcxx/include/span +++ b/contrib/libs/cxxsupp/libcxx/include/span @@ -591,23 +591,23 @@ public: _LIBCPP_INLINE_VISIBILITY constexpr reverse_iterator rbegin() const noexcept { return reverse_iterator(end()); } _LIBCPP_INLINE_VISIBILITY constexpr reverse_iterator rend() const noexcept { return reverse_iterator(begin()); } - inline _LIBCPP_INLINE_VISIBILITY span<const byte, dynamic_extent> __as_bytes() const noexcept; + inline _LIBCPP_INLINE_VISIBILITY span<const byte, dynamic_extent> __as_bytes() const noexcept; - inline _LIBCPP_INLINE_VISIBILITY span<byte, dynamic_extent> __as_writable_bytes() const noexcept; + inline _LIBCPP_INLINE_VISIBILITY span<byte, dynamic_extent> __as_writable_bytes() const noexcept; private: pointer __data; size_type __size; }; -template<typename _Tp> -inline _LIBCPP_INLINE_VISIBILITY span<const byte, dynamic_extent> span<_Tp, dynamic_extent>::__as_bytes() const noexcept -{ return {reinterpret_cast<const byte *>(data()), size_bytes()}; } - -template<typename _Tp> -inline _LIBCPP_INLINE_VISIBILITY span<byte, dynamic_extent> span<_Tp, dynamic_extent>::__as_writable_bytes() const noexcept -{ return {reinterpret_cast<byte *>(data()), size_bytes()}; } - +template<typename _Tp> +inline _LIBCPP_INLINE_VISIBILITY span<const byte, dynamic_extent> span<_Tp, dynamic_extent>::__as_bytes() const noexcept +{ return {reinterpret_cast<const byte *>(data()), size_bytes()}; } + +template<typename _Tp> +inline _LIBCPP_INLINE_VISIBILITY span<byte, dynamic_extent> span<_Tp, dynamic_extent>::__as_writable_bytes() const noexcept +{ return {reinterpret_cast<byte *>(data()), size_bytes()}; } + #if !defined(_LIBCPP_HAS_NO_RANGES) template <class _Tp, size_t _Extent> inline constexpr bool ranges::enable_borrowed_range<span<_Tp, _Extent> > = true; diff --git a/contrib/libs/cxxsupp/libcxx/include/unwind.h b/contrib/libs/cxxsupp/libcxx/include/unwind.h index 9120d3eaecd..c6082022306 100644 --- a/contrib/libs/cxxsupp/libcxx/include/unwind.h +++ b/contrib/libs/cxxsupp/libcxx/include/unwind.h @@ -1,7 +1,7 @@ -#pragma once - -#if defined(__IOS__) -#include_next <unwind.h> -#else -#include <contrib/libs/cxxsupp/libcxxrt/unwind.h> -#endif +#pragma once + +#if defined(__IOS__) +#include_next <unwind.h> +#else +#include <contrib/libs/cxxsupp/libcxxrt/unwind.h> +#endif diff --git a/contrib/libs/cxxsupp/libcxx/include/version b/contrib/libs/cxxsupp/libcxx/include/version index 3190948aed1..0e15cfad809 100644 --- a/contrib/libs/cxxsupp/libcxx/include/version +++ b/contrib/libs/cxxsupp/libcxx/include/version @@ -203,11 +203,11 @@ __cpp_lib_void_t 201411L <type_traits> # define __cpp_lib_allocator_traits_is_always_equal 201411L # define __cpp_lib_any 201606L # define __cpp_lib_apply 201603L -# if defined(_MSC_VER) && _MSC_VER >= 1926 -# define __cpp_lib_array_constexpr 201803L -# else -# define __cpp_lib_array_constexpr 201603L -# endif +# if defined(_MSC_VER) && _MSC_VER >= 1926 +# define __cpp_lib_array_constexpr 201803L +# else +# define __cpp_lib_array_constexpr 201603L +# endif # define __cpp_lib_as_const 201510L # if !defined(_LIBCPP_HAS_NO_THREADS) # define __cpp_lib_atomic_is_always_lock_free 201603L @@ -250,11 +250,11 @@ __cpp_lib_void_t 201411L <type_traits> # endif # define __cpp_lib_shared_ptr_arrays 201611L # define __cpp_lib_shared_ptr_weak_type 201606L -# if defined(_MSC_VER) && _MSC_VER >= 1926 -# define __cpp_lib_string_view 201803L -# else -# define __cpp_lib_string_view 201606L -# endif +# if defined(_MSC_VER) && _MSC_VER >= 1926 +# define __cpp_lib_string_view 201803L +# else +# define __cpp_lib_string_view 201606L +# endif // # define __cpp_lib_to_chars 201611L # undef __cpp_lib_transparent_operators # define __cpp_lib_transparent_operators 201510L diff --git a/contrib/libs/cxxsupp/libcxx/src/support/runtime/exception_pointer_msvc.ipp b/contrib/libs/cxxsupp/libcxx/src/support/runtime/exception_pointer_msvc.ipp index 63126a53053..300acbf759c 100644 --- a/contrib/libs/cxxsupp/libcxx/src/support/runtime/exception_pointer_msvc.ipp +++ b/contrib/libs/cxxsupp/libcxx/src/support/runtime/exception_pointer_msvc.ipp @@ -137,8 +137,8 @@ struct ExceptionPtr { free(exception_object); } - // _bad_alloc_storage must be initialized before bad_alloc, so we declare and define it first. - static std::bad_alloc _bad_alloc_storage; + // _bad_alloc_storage must be initialized before bad_alloc, so we declare and define it first. + static std::bad_alloc _bad_alloc_storage; static ExceptionPtr bad_alloc; //static ExceptionPtr bad_exception; }; @@ -148,11 +148,11 @@ struct ExceptionPtr { #pragma clang diagnostic ignored "-Waddress-of-temporary" #endif -std::bad_alloc ExceptionPtr::_bad_alloc_storage; - +std::bad_alloc ExceptionPtr::_bad_alloc_storage; + ExceptionPtr ExceptionPtr::bad_alloc( - &ExceptionPtr::_bad_alloc_storage, - reinterpret_cast<const EHThrowInfo*>(__GetExceptionInfo(ExceptionPtr::_bad_alloc_storage))); + &ExceptionPtr::_bad_alloc_storage, + reinterpret_cast<const EHThrowInfo*>(__GetExceptionInfo(ExceptionPtr::_bad_alloc_storage))); /* ExceptionPtr ExceptionPtr::bad_exception(&std::bad_exception(), diff --git a/contrib/libs/cxxsupp/libcxx/ya.make b/contrib/libs/cxxsupp/libcxx/ya.make index e22c5f2ef75..15403fe6d5f 100644 --- a/contrib/libs/cxxsupp/libcxx/ya.make +++ b/contrib/libs/cxxsupp/libcxx/ya.make @@ -1,12 +1,12 @@ LIBRARY() -LICENSE( +LICENSE( Apache-2.0 AND Apache-2.0 WITH LLVM-exception AND BSD-2-Clause AND MIT AND NCSA -) +) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) @@ -25,9 +25,9 @@ ADDINCL( CXXFLAGS(-D_LIBCPP_BUILDING_LIBRARY) -IF (OS_ANDROID) - DEFAULT(CXX_RT "default") - IF (ARCH_I686 OR ARCH_ARM7) +IF (OS_ANDROID) + DEFAULT(CXX_RT "default") + IF (ARCH_I686 OR ARCH_ARM7) # 32-bit architectures require additional libandroid_support.so to be linked # We add --start-group / --end-group statements due to the issue in NDK < r22. # See: https://github.com/android/ndk/issues/1130 @@ -41,7 +41,7 @@ IF (OS_ANDROID) ) ELSE() LDFLAGS(-lc++abi) - ENDIF() + ENDIF() CFLAGS( -DLIBCXX_BUILDING_LIBCXXABI ) @@ -83,13 +83,13 @@ ELSEIF (OS_WINDOWS) GLOBAL -D_LIBCPP_VASPRINTF_DEFINED GLOBAL -D_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_ ) - IF (CLANG_CL) + IF (CLANG_CL) PEERDIR( contrib/libs/cxxsupp/builtins ) - ENDIF() + ENDIF() ELSE() - DEFAULT(CXX_RT "glibcxx_static") + DEFAULT(CXX_RT "glibcxx_static") CXXFLAGS( -Wno-unknown-pragmas -nostdinc++ @@ -104,20 +104,20 @@ IF (CLANG) CFLAGS( GLOBAL -nostdinc++ ) -ENDIF() - -# The CXX_RT variable controls which C++ runtime is used. -# * libcxxrt - https://github.com/pathscale/libcxxrt library stored in Arcadia -# * glibcxx - GNU C++ Library runtime with default (static) linkage -# * glibcxx_static - GNU C++ Library runtime with static linkage -# * glibcxx_dynamic - GNU C++ Library runtime with dynamic linkage -# * glibcxx_driver - GNU C++ Library runtime provided by the compiler driver -# * default - default C++ runtime provided by the compiler driver -# -# All glibcxx* runtimes are taken from system/compiler SDK - -DEFAULT(CXX_RT "default") - +ENDIF() + +# The CXX_RT variable controls which C++ runtime is used. +# * libcxxrt - https://github.com/pathscale/libcxxrt library stored in Arcadia +# * glibcxx - GNU C++ Library runtime with default (static) linkage +# * glibcxx_static - GNU C++ Library runtime with static linkage +# * glibcxx_dynamic - GNU C++ Library runtime with dynamic linkage +# * glibcxx_driver - GNU C++ Library runtime provided by the compiler driver +# * default - default C++ runtime provided by the compiler driver +# +# All glibcxx* runtimes are taken from system/compiler SDK + +DEFAULT(CXX_RT "default") + DISABLE(NEED_GLIBCXX_CXX17_SHIMS) IF (CXX_RT == "libcxxrt") @@ -143,7 +143,7 @@ ELSEIF (CXX_RT == "glibcxx" OR CXX_RT == "glibcxx_static") -lgcc_eh -Wl,-Bdynamic ) - CXXFLAGS(-D__GLIBCXX__=1) + CXXFLAGS(-D__GLIBCXX__=1) ENABLE(NEED_GLIBCXX_CXX17_SHIMS) CFLAGS( GLOBAL -DLIBCXX_BUILDING_LIBGCC @@ -153,19 +153,19 @@ ELSEIF (CXX_RT == "glibcxx_dynamic") -lgcc_s -lstdc++ ) - CXXFLAGS(-D__GLIBCXX__=1) + CXXFLAGS(-D__GLIBCXX__=1) CFLAGS( GLOBAL -DLIBCXX_BUILDING_LIBGCC ) ENABLE(NEED_GLIBCXX_CXX17_SHIMS) ELSEIF (CXX_RT == "glibcxx_driver") - CXXFLAGS(-D__GLIBCXX__=1) + CXXFLAGS(-D__GLIBCXX__=1) ELSEIF (CXX_RT == "default") - # Do nothing -ELSE() + # Do nothing +ELSE() MESSAGE(FATAL_ERROR "Unexpected CXX_RT value: ${CXX_RT}") -ENDIF() - +ENDIF() + IF (NEED_GLIBCXX_CXX17_SHIMS) IF (GCC) # Assume GCC is bundled with a modern enough version of C++ runtime |