From 45d72923a3be71851d45d6d1c6f2ec90706698ea Mon Sep 17 00:00:00 2001 From: mustiikhalil <26250654+mustiikhalil@users.noreply.github.com> Date: Sat, 11 May 2024 19:49:54 +0200 Subject: [PATCH] Tries to Fix macOS based compile --- grpc/build_grpc_with_cxx14.patch | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/grpc/build_grpc_with_cxx14.patch b/grpc/build_grpc_with_cxx14.patch index b5900af5b34d..dd1185350371 100644 --- 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"], ++}) \ No newline at end of file