diff options
| author |  Alexander Polcyn <apolcyn@google.com> | 2017-12-28 18:09:19 -0800 |
|---|---|---|
| committer | Alexander Polcyn <apolcyn@google.com> | 2018-03-20 23:51:23 -0700 |
| commit | d21ee150765c73876992bbf06c716b4600ba047f (patch) | |
| tree | ef97400ceb7007fc0c1498e61adf851cdc0eaa26 /bazel | |
| parent | 690dde672a877083e29ee5af0b8252697aa48fa0 (diff) | |
Stop relying on certain ipv6 macros. Also bazel build updates.
Fix error just made in bazel/grpc_build_system.bzl
Fix merge conflict support/env -> gpr/env
Diffstat (limited to 'bazel')
| -rw-r--r-- | bazel/grpc_build_system.bzl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl index 2b4ec68aa3..03a6bd7824 100644 --- a/bazel/grpc_build_system.bzl +++ b/bazel/grpc_build_system.bzl @@ -38,11 +38,11 @@ def _get_external_deps(external_deps): for dep in external_deps: if dep == "nanopb": ret += ["grpc_nanopb"] + elif dep == "address_sorting": + ret += ["//third_party/address_sorting"] elif dep == "cares": ret += select({"//:grpc_no_ares": [], "//conditions:default": ["//external:cares"],}) - elif dep == "address_sorting": - ret += ["//third_party/address_sorting"] else: ret += ["//external:" + dep] return ret |