Skip to content

Commit b47aa71

Browse files
meteorcloudycopybara-github
authored andcommitted
Upgrade abseil version to the latest
Fixes #15168 Closes #15177. PiperOrigin-RevId: 439541810
1 parent ab77bd5 commit b47aa71

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

WORKSPACE

+6
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,12 @@ dist_http_archive(
625625
name = "com_github_grpc_grpc",
626626
)
627627

628+
# Override the abseil-cpp version defined in grpc_deps(), which doesn't work on latest macOS
629+
# Fixes https://github.com/bazelbuild/bazel/issues/15168
630+
dist_http_archive(
631+
name = "com_google_absl",
632+
)
633+
628634
# Projects using gRPC as an external dependency must call both grpc_deps() and
629635
# grpc_extra_deps().
630636
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")

distdir_deps.bzl

+6-5
Original file line numberDiff line numberDiff line change
@@ -167,17 +167,18 @@ DIST_DEPS = {
167167
"test_WORKSPACE_files",
168168
],
169169
},
170-
"abseil-cpp": {
171-
"archive": "997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz",
172-
"sha256": "35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee",
170+
"com_google_absl": {
171+
"archive": "20211102.0.tar.gz",
172+
"sha256": "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4",
173173
"urls": [
174-
"https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz",
175-
"https://github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz",
174+
"https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
175+
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
176176
],
177177
"used_in": [
178178
"additional_distfiles",
179179
"test_WORKSPACE_files",
180180
],
181+
"strip_prefix": "abseil-cpp-20211102.0",
181182
},
182183
"zstd-jni": {
183184
"archive": "v1.5.0-4.zip",

0 commit comments

Comments
 (0)