Tries to Fix macOS based compile

google · May 11, 2024 · 45d7292 · 45d7292
1 parent 04e6592
commit 45d7292
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/grpc/build_grpc_with_cxx14.patch b/grpc/build_grpc_with_cxx14.patch
@@ -1,13 +1,21 @@
 diff --git a/bazel/copts.bzl b/bazel/copts.bzl
-index 10be944f25..879518b92f 100644
+index 4715100056..274ee502af 100644
 --- a/bazel/copts.bzl
 +++ b/bazel/copts.bzl
-@@ -59,4 +59,7 @@ GRPC_LLVM_WARNING_FLAGS = [
+@@ -45,7 +45,6 @@ GRPC_LLVM_WARNING_FLAGS = [
+     "-Wtautological-overlap-compare",
+     "-Wthread-safety-analysis",
+     "-Wthread-safety-beta",
+-    "-Wunused-but-set-variable",
+     "-Wunused-comparison",
+     "-Wvla",
+     # -Wextra compatibility between gcc and clang
+@@ -60,4 +59,7 @@ GRPC_LLVM_WARNING_FLAGS = [
  GRPC_DEFAULT_COPTS = select({
      "//:use_strict_warning": GRPC_LLVM_WARNING_FLAGS + ["-DUSE_STRICT_WARNING=1"],
      "//conditions:default": [],
 -})
 +}) + select({
-+        "@bazel_tools//src/conditions:windows": ["/std:c++14"],
-+        "//conditions:default": ["-std=c++14"],
-+})
++    "@bazel_tools//src/conditions:windows": ["/std:c++14"],
++    "//conditions:default": ["-std=c++14"],
++})