diff options
| author | thegeorg <thegeorg@yandex-team.com> | 2022-08-27 13:30:25 +0300 |
|---|---|---|
| committer | thegeorg <thegeorg@yandex-team.com> | 2022-08-27 13:30:25 +0300 |
| commit | a6dca9095240340aacbe83d5c64980c47a17042c (patch) | |
| tree | e371ed309b57e90abd131f1ce620b9d3f7c31a3e /contrib/libs/cxxsupp | |
| parent | 60b1a0e94a98ef0f43e94c494afa9d06ffe225b6 (diff) | |
| download | ydb-a6dca9095240340aacbe83d5c64980c47a17042c.tar.gz | |
Fix compiling with MSVC + NVCC on Windows
Diffstat (limited to 'contrib/libs/cxxsupp')
| -rw-r--r-- | contrib/libs/cxxsupp/libcxx/include/__config | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/libs/cxxsupp/libcxx/include/__config b/contrib/libs/cxxsupp/libcxx/include/__config index 3f383a82d0..40cb732b3c 100644 --- a/contrib/libs/cxxsupp/libcxx/include/__config +++ b/contrib/libs/cxxsupp/libcxx/include/__config @@ -619,8 +619,11 @@ typedef __char32_t char32_t; #undef __has_builtin #define __has_builtin(x) __has_builtin_##x #define __has_builtin___builtin_addressof 1 -#if _MSC_VER >= 1925 -#define __has_builtin___builtin_is_constant_evaluated 1 +#if defined(_MSC_VER) && defined(__CUDACC__) + // nvcc fails to compile __builtin_is_constant_evaluated() at the time +# define _LIBCPP_HAS_NO_BUILTIN_IS_CONSTANT_EVALUATED 1 +#else +# define __has_builtin___builtin_is_constant_evaluated 1 #endif #define _LIBCPP_WEAK |