Skip to content

Commit

Permalink
Upgrade abseil version to the latest
Browse files Browse the repository at this point in the history
Fixes #15168

Closes #15177.

PiperOrigin-RevId: 439541810
  • Loading branch information
meteorcloudy authored and copybara-github committed Apr 5, 2022
1 parent ab77bd5 commit b47aa71
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
6 changes: 6 additions & 0 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,12 @@ dist_http_archive(
name = "com_github_grpc_grpc",
)

# Override the abseil-cpp version defined in grpc_deps(), which doesn't work on latest macOS
# Fixes https://github.com/bazelbuild/bazel/issues/15168
dist_http_archive(
name = "com_google_absl",
)

# Projects using gRPC as an external dependency must call both grpc_deps() and
# grpc_extra_deps().
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
Expand Down
11 changes: 6 additions & 5 deletions distdir_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -167,17 +167,18 @@ DIST_DEPS = {
"test_WORKSPACE_files",
],
},
"abseil-cpp": {
"archive": "997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz",
"sha256": "35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee",
"com_google_absl": {
"archive": "20211102.0.tar.gz",
"sha256": "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4",
"urls": [
"https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz",
"https://github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz",
"https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
],
"used_in": [
"additional_distfiles",
"test_WORKSPACE_files",
],
"strip_prefix": "abseil-cpp-20211102.0",
},
"zstd-jni": {
"archive": "v1.5.0-4.zip",
Expand Down

0 comments on commit b47aa71

Please sign in to comment.