Skip to content

Commit ffa2a0b

Browse files
Upgrade abseil version to the latest (#15183)
Fixes #15168 Closes #15177. PiperOrigin-RevId: 439541810 Co-authored-by: Yun Peng <[email protected]>
1 parent d418245 commit ffa2a0b

2 files changed

Lines changed: 12 additions & 5 deletions

File tree

WORKSPACE

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,6 +1099,12 @@ dist_http_archive(
10991099
name = "com_github_grpc_grpc",
11001100
)
11011101

1102+
# Override the abseil-cpp version defined in grpc_deps(), which doesn't work on latest macOS
1103+
# Fixes https://github.com/bazelbuild/bazel/issues/15168
1104+
dist_http_archive(
1105+
name = "com_google_absl",
1106+
)
1107+
11021108
# Projects using gRPC as an external dependency must call both grpc_deps() and
11031109
# grpc_extra_deps().
11041110
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")

distdir_deps.bzl

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,17 +161,18 @@ DIST_DEPS = {
161161
"test_WORKSPACE_files",
162162
],
163163
},
164-
"abseil-cpp": {
165-
"archive": "997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz",
166-
"sha256": "35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee",
164+
"com_google_absl": {
165+
"archive": "20211102.0.tar.gz",
166+
"sha256": "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4",
167167
"urls": [
168-
"https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz",
169-
"https://github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz",
168+
"https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
169+
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
170170
],
171171
"used_in": [
172172
"additional_distfiles",
173173
"test_WORKSPACE_files",
174174
],
175+
"strip_prefix": "abseil-cpp-20211102.0",
175176
},
176177
"zstd-jni": {
177178
"archive": "v1.5.0-4.zip",

0 commit comments

Comments
 (0)