Remove extra unnecessary filegroups

This didn't vary per platform so we don't need N of them
bazelbuild · Jul 23, 2024 · bb42c84 · bb42c84
1 parent 27149c8
commit bb42c84
Showing 1 changed file with 19 additions and 22 deletions.
diff --git a/crosstool/BUILD.tpl b/crosstool/BUILD.tpl
@@ -48,34 +48,31 @@ filegroup(
     ],
 )
 
-[
-    filegroup(
-        name = "osx_tools_" + arch,
-        srcs = [
-            ":cc_wrapper",
-            ":libtool",
-            ":libtool_check_unique",
-            ":make_hashed_objlist.py",
-            ":modulemap",
-            ":wrapped_clang",
-            ":wrapped_clang_pp",
-            ":xcrunwrapper.sh",
-        ],
-    )
-    for arch in _APPLE_ARCHS
-]
+filegroup(
+    name = "tools",
+    srcs = [
+        ":cc_wrapper",
+        ":libtool",
+        ":libtool_check_unique",
+        ":make_hashed_objlist.py",
+        ":modulemap",
+        ":wrapped_clang",
+        ":wrapped_clang_pp",
+        ":xcrunwrapper.sh",
+    ],
+)
 
 [
     cc_toolchain(
         name = "cc-compiler-" + arch,
-        all_files = ":osx_tools_" + arch,
-        ar_files = ":osx_tools_" + arch,
-        as_files = ":osx_tools_" + arch,
-        compiler_files = ":osx_tools_" + arch,
+        all_files = ":tools",
+        ar_files = ":tools",
+        as_files = ":tools",
+        compiler_files = ":tools",
         dwp_files = ":empty",
-        linker_files = ":osx_tools_" + arch,
+        linker_files = ":tools",
         objcopy_files = ":empty",
-        strip_files = ":osx_tools_" + arch,
+        strip_files = ":tools",
         supports_header_parsing = 1,
         supports_param_files = 1,
         toolchain_config = arch,