update reference to @toolchains_llvm (#30)

Change-Id: I21d2726ac2bf8ac9c1d540ad9bbd07fafeef2d8f

WORKSPACE.bazel

@@ -22,7 +22,6 @@ COMMON_CXX_WARNINGS = [
     "-Wimplicit-fallthrough",
 ]
 
-# bazel_toolchain also loads rules_cc but an older version
 http_archive(
     name = "rules_cc",
     sha256 = "2037875b9a4456dce4a79d112a8ae885bbc4aad968e6587dca6e64f3a0900cdf",
@@ -63,16 +62,16 @@ bootlin_toolchain(
     libc_impl = "glibc",
 )
 
-BAZEL_TOOLCHAIN_COMMIT = "ade23e0e37c5308162c012a4f4224459c1c4fa22"
+TOOLCHAINS_LLVM_COMMIT = "ade23e0e37c5308162c012a4f4224459c1c4fa22"
 
 http_archive(
-    name = "bazel_toolchain",
-    sha256 = "968e507ce913b93971aeb77b4b0a96f7b59b1f51cbaae57aefef4c573776ed56",
-    strip_prefix = "bazel-toolchain-{commit}".format(
-        commit = BAZEL_TOOLCHAIN_COMMIT,
+    name = "toolchains_llvm",
+    integrity = "sha256-w3ZChtMXOMPuczl1aCct33Hx29RDmYkgNY/XlwItdH8=",
+    strip_prefix = "toolchains_llvm-{commit}".format(
+        commit = TOOLCHAINS_LLVM_COMMIT,
     ),
-    url = "https://github.com/grailbio/bazel-toolchain/archive/{commit}.tar.gz".format(
-        commit = BAZEL_TOOLCHAIN_COMMIT,
+    url = "https://github.com/bazel-contrib/toolchains_llvm/archive/{commit}.tar.gz".format(
+        commit = TOOLCHAINS_LLVM_COMMIT,
     ),
 )
 

tools/llvm_toolchain.bzl

@@ -4,11 +4,11 @@ instead of the system installed libraries.
 """
 
 load(
-    "@bazel_toolchain//toolchain:deps.bzl",
+    "@toolchains_llvm//toolchain:deps.bzl",
     _llvm_toolchain_dependencies = "bazel_toolchain_dependencies",
 )
 load(
-    "@bazel_toolchain//toolchain:rules.bzl",
+    "@toolchains_llvm//toolchain:rules.bzl",
     _llvm_toolchain = "llvm_toolchain",
     _llvm_toolchain_files = "llvm",
 )
@@ -97,7 +97,7 @@ def llvm_toolchain(linux_x86_64_sysroot = "", **kwargs):
         fail("""
         This rule requires the sysroot to be specified for linux-x86_64
         platforms. If this not desired, use `llvm_toolchain` from
-        `@bazel_toolchain` directly.
+        `@toolchains_llvm` directly.
         """)
 
     linux_x86_64_sysroot_pkg = linux_x86_64_sysroot

tools/llvm_toolchain_dependencies.bzl

@@ -3,7 +3,7 @@ Provides a wrapper around `bazel_toolchain_dependencies` which also obtains the
 abspath to Bazel's external directory for use by the `llvm_toolchain` wrapper.
 """
 
-load("@bazel_toolchain//toolchain:deps.bzl", "bazel_toolchain_dependencies")
+load("@toolchains_llvm//toolchain:deps.bzl", "bazel_toolchain_dependencies")
 load("//tools:local_config_info.bzl", "local_config_info")
 
 #  Rename to (hopefully) be less confusing