From d21ee150765c73876992bbf06c716b4600ba047f Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Thu, 28 Dec 2017 18:09:19 -0800 Subject: 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 --- bazel/grpc_build_system.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bazel') 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 -- cgit v1.2.3