Skip to content

Commit 3687f0b

Browse files
committed
Remove local grpc patch to disable absl async, and use a grpc specific macro to disable it (used for now for Mac OS)
1 parent 6f85617 commit 3687f0b

File tree

3 files changed

+2
-22
lines changed

3 files changed

+2
-22
lines changed

.bazelrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ build:windows --copt="/Brepro" --copt="/guard:cf" --copt="/guard:
4646
build:windows --host_copt="/Brepro" --copt="/guard:cf" --copt="/guard:ehcont" --copt="/Z7" --copt="/JMC-" --copt="/sdl"
4747
build:windows --linkopt="/Brepro" --linkopt="/guard:cf" --linkopt="/guard:ehcont" --linkopt="/DEBUG:FULL" --linkopt="/CETCOMPAT" --linkopt="/SWAPRUN:NET,CD" --linkopt="/OPT:REF,NOICF" --linkopt="/RELEASE" --linkopt="/DEBUGTYPE:CV,PDATA,FIXUP"
4848
build:windows --host_linkopt="/Brepro" --linkopt="/guard:cf" --linkopt="/guard:ehcont" --linkopt="/DEBUG:FULL" --linkopt="/CETCOMPAT" --linkopt="/SWAPRUN:NET,CD" --linkopt="/OPT:REF,NOICF" --linkopt="/RELEASE" --linkopt="/DEBUGTYPE:CV,PDATA,FIXUP"
49-
build:windows --copt="/Zc:strictStrings" --copt="/Gy"
50-
build:windows --host_copt="/Zc:strictStrings" --copt="/Gy"
49+
build:windows --copt="/Zc:strictStrings" --copt="/Gy" --copt="-DGPR_DISABLE_ABSEIL_SYNC"
50+
build:windows --host_copt="/Zc:strictStrings" --host_copt="/Gy" --host_copt="-DGPR_DISABLE_ABSEIL_SYNC"
5151
build:windows --host_linkopt="shell32.lib"
5252
# Requires Visual Studio 2019 Build Tools installed in default location with the latest compiler (14.29.30133) for x64
5353
build:windows --action_env=BAZEL_VC_FULL_VERSION=14.42.34433 --action_env=BAZEL_WINSDK_FULL_VERSION=10.0.26100.0

MODULE.bazel

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,6 @@ bazel_dep(name = "gazelle", version = "0.44.0")
2525
bazel_dep(name = "stardoc", version = "0.8.0")
2626
bazel_dep(name = "rules_android", version = "0.6.5")
2727
bazel_dep(name = "grpc", version = "1.73.1")
28-
single_version_override(
29-
module_name = "grpc",
30-
patch_strip = 1,
31-
patches = [
32-
"bazel/grpc_no_absl_sync.patch",
33-
],
34-
)
3528
bazel_dep(name = "nlohmann_json", version = "3.12.0")
3629
bazel_dep(name = "platforms", version = "1.0.0")
3730
bazel_dep(name = "rules_cc", version = "0.1.2")

bazel/grpc_no_absl_sync.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)