tiamak/p2pool-salvium-stare
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update grpc

Browse Source
This commit is contained in:
SChernykh
2024-05-19 23:50:44 +02:00
parent 84b656ebbd
commit b0a63e2d34
3 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/c-cpp.yml
-2
View File
@@ -357,8 +357,6 @@ jobs:
run: | run: |
cd external/src/grpc/third_party/boringssl-with-bazel cd external/src/grpc/third_party/boringssl-with-bazel
git apply --verbose --ignore-whitespace ../../../../../patches/msys2/gcc14_boringssl.patch git apply --verbose --ignore-whitespace ../../../../../patches/msys2/gcc14_boringssl.patch
cd ../abseil-cpp
git apply --verbose --ignore-whitespace ../../../../../patches/msys2/gcc14_abseil.patch
cd / cd /
git apply --verbose --ignore-whitespace --directory=mingw64/include/c++/`ls mingw64/include/c++`/ /d/a/p2pool/p2pool/patches/msys2/typeinfo.patch git apply --verbose --ignore-whitespace --directory=mingw64/include/c++/`ls mingw64/include/c++`/ /d/a/p2pool/p2pool/patches/msys2/typeinfo.patch
external/src/grpc
Vendored
+1 -1
Submodule external/src/grpc updated: 62618530b0...783e600967
patches/msys2/gcc14_abseil.patch
-13
View File
@@ -1,13 +0,0 @@
diff --git a/absl/numeric/internal/bits.h b/absl/numeric/internal/bits.h
index bfef06bc..3091d1b4 100644
--- a/absl/numeric/internal/bits.h
+++ b/absl/numeric/internal/bits.h
@@ -303,7 +303,7 @@ CountTrailingZeroesNonzero64(uint64_t x) {
ABSL_ATTRIBUTE_ALWAYS_INLINE ABSL_INTERNAL_CONSTEXPR_CTZ inline int
CountTrailingZeroesNonzero16(uint16_t x) {
-#if ABSL_HAVE_BUILTIN(__builtin_ctzs)
+#if ABSL_HAVE_BUILTIN(__builtin_ctzs) && defined(__clang__)
static_assert(sizeof(unsigned short) == sizeof(x), // NOLINT(runtime/int)
"__builtin_ctzs does not take 16-bit arg");
return __builtin_ctzs(x);