From a8421af4cc043a0f62dc0541e830404f23c3486f Mon Sep 17 00:00:00 2001
From: John Sun <79071267+jsun-splunk@users.noreply.github.com>
Date: Tue, 19 Nov 2024 09:18:27 +1100
Subject: [PATCH] fix: let 'toolchain' attr be selectable (#1321)

---
 foreign_cc/private/transitions.bzl | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/foreign_cc/private/transitions.bzl b/foreign_cc/private/transitions.bzl
index 0a89efad..ff166a6f 100644
--- a/foreign_cc/private/transitions.bzl
+++ b/foreign_cc/private/transitions.bzl
@@ -3,7 +3,7 @@
 load("//foreign_cc:providers.bzl", "ForeignCcDepsInfo")
 
 def _extra_toolchains_transition_impl(settings, attrs):
-    return {"//command_line_option:extra_toolchains": attrs.extra_toolchains + settings["//command_line_option:extra_toolchains"]}
+    return {"//command_line_option:extra_toolchains": [attrs.extra_toolchain] + settings["//command_line_option:extra_toolchains"]}
 
 _extra_toolchains_transition = transition(
     implementation = _extra_toolchains_transition_impl,
@@ -21,12 +21,13 @@ def _extra_toolchains_transitioned_foreign_cc_target_impl(ctx):
     ]
 
 extra_toolchains_transitioned_foreign_cc_target = rule(
-    doc = "A rule for adding extra toolchains to consider when building the given target",
+    doc = "A rule for adding an extra toolchain to consider when building the given target",
     implementation = _extra_toolchains_transitioned_foreign_cc_target_impl,
     cfg = _extra_toolchains_transition,
     attrs = {
-        "extra_toolchains": attr.string_list(
-            doc = "Additional toolchains to consider",
+        # This attr is singular to make it selectable when used for add make toolchain variant.
+        "extra_toolchain": attr.string(
+            doc = "Additional toolchain to consider. Note, this is singular.",
             mandatory = True,
         ),
         "target": attr.label(
@@ -64,7 +65,7 @@ def foreign_cc_rule_variant(name, rule, toolchain, **kwargs):
 
     extra_toolchains_transitioned_foreign_cc_target(
         name = name,
-        extra_toolchains = [toolchain],
+        extra_toolchain = toolchain,
         target = foreign_cc_rule_target_name,
         tags = tags,
         visibility = visibility,