more

Author: phlax

.bazelrc

@@ -17,9 +17,6 @@ build:remote --remote_timeout=7200
 build --repo_env=BAZEL_LLVM_PATH=/usr/lib/llvm
 build:linux --config=clang
 
-# put /usr/local/bin before /usr/bin to avoid picking up wrong python3.6 when building envoy.tls.key_providers.cryptomb
-build:linux --action_env=PATH=/usr/lib/llvm/bin:/usr/local/bin:/bin:/usr/bin
-
 # Need for CI image to pickup docker-credential-gcloud, PATH is fixed in rbe-toolchain-* configs.
 build:remote-ci --action_env=PATH=/usr/local/google-cloud-sdk/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/llvm/bin
 
@@ -51,9 +48,6 @@ build:debug -c dbg
 build --cxxopt -Wformat
 build --cxxopt -Wformat-security
 
-build:clang --host_action_env=CC=
-build:clang --host_action_env=CXX=
-
 # CI sanitizer configuration
 #
 build:clang-asan-ci --config=asan

WORKSPACE

@@ -81,3 +81,7 @@ envoy_repo()
 load("@envoy//bazel:toolchains.bzl", "envoy_toolchains")
 
 envoy_toolchains()
+
+load("@llvm_toolchain//:toolchains.bzl", "llvm_register_toolchains")
+
+llvm_register_toolchains()