From f9567724ad87f06d9e20e19f75dc4aa56660dafb Mon Sep 17 00:00:00 2001
From: Brad Nolan <brad@throttle.co.nz>
Date: Sat, 5 Apr 2025 09:28:51 +1300
Subject: [PATCH] Remove cc_args_list shims, which arent needed anymore for
 cc_feature

---
 bazel/toolchain/BUILD.bazel | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/bazel/toolchain/BUILD.bazel b/bazel/toolchain/BUILD.bazel
index 80bb9104..1539c3ed 100644
--- a/bazel/toolchain/BUILD.bazel
+++ b/bazel/toolchain/BUILD.bazel
@@ -150,26 +150,16 @@ configurable_toolchain_feature(
     linkopts = ["-Wl,-z,max-page-size=4096"],
 )
 
-# TODO: Make this shim unnecessary.
-cc_args_list(
-    name = "all_debug_args",
-    args = [":debug_args"],
-)
-
-cc_args_list(
-    name = "all_opt_args",
-    args = [":opt_args"],
-)
 
 cc_feature(
     name = "dbg",
-    args = [":all_debug_args"],
+    args = [":debug_args"],
     overrides = "@rules_cc//cc/toolchains/features:dbg",
 )
 
 cc_feature(
     name = "opt",
-    args = [":all_opt_args"],
+    args = [":opt_args"],
     overrides = "@rules_cc//cc/toolchains/features:opt",
 )