llvm_toolchain: ar and as files

Fixes bazel-contrib#25.
per-gron · Oct 14, 2019 · 2200d53 · 2200d53
1 parent 8f2721a
commit 2200d53
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh
@@ -42,7 +42,7 @@ chmod a+x "${bazel}"
 
 set -x
 "${bazel}" version
-"${bazel}" --migrate test \
+"${bazel}" --migrate --bazelrc=/dev/null test \
   --extra_toolchains="${toolchain_name}" \
   --copt=-v \
   --linkopt=-Wl,-t \

diff --git a/toolchain/BUILD.tpl b/toolchain/BUILD.tpl
@@ -192,7 +192,6 @@ filegroup(
 filegroup(
     name = "linker_components",
     srcs = [
-        ":ar",
         ":clang",
         ":ld",
         ":lib",

diff --git a/toolchain/internal/configure.bzl b/toolchain/internal/configure.bzl
@@ -128,6 +128,8 @@ def conditional_cc_toolchain(name, darwin, absolute_paths = False):
             toolchain_config = toolchain_config,
             all_files = name + "-all-files",
             compiler_files = name + "-compiler-files",
+            ar_files = ":ar",
+            as_files = ":as",
             dwp_files = ":empty",
             linker_files = name + "-linker-files",
             objcopy_files = ":objcopy",