Get os based args working in toolchains

Author: reutermj

BUILD

@@ -3,7 +3,10 @@ load("@rules_cc//cc/toolchains:toolchain.bzl", "cc_toolchain")
 
 cc_toolchain(
     name = "toolchains_cc_toolchain",
-    args = ["//runtimes:args"],
+    args = [
+        "//toolchain:args",
+        "//runtimes:args",
+    ],
     enabled_features = ["@rules_cc//cc/toolchains/args:experimental_replace_legacy_action_config_features"],
     known_features = ["@rules_cc//cc/toolchains/args:experimental_replace_legacy_action_config_features"],
     tool_map = "//toolchain:all_tools",

repo_gen/generate_repo.py

@@ -94,6 +94,19 @@ def create_single_label(label, num_spaces):
 
 """.lstrip()
 
+cc_arg_os_tpl = """
+cc_args(
+    name = "llvm-{action}",
+    actions = [
+        "@rules_cc//cc/toolchains/actions:{action}",
+    ],
+    args = select({{
+        {args}
+    }}),
+)
+
+""".lstrip()
+
 # ==================
 # || MODULE.bazel ||
 # ==================
@@ -143,7 +156,7 @@ def generate_module():
 def create_latest(row, dir):
     name = row["name"]
 
-    if "configurations" not in row:
+    if "configurations" not in row or "all" not in row["configurations"]:
         return config_setting_tpl.format(
             name=f"{name}-latest",
             value=f"{name}",
@@ -171,6 +184,9 @@ def create_latest_with_configurations(row, dir):
     if "configurations" not in row:
         return ""
 
+    if "all" not in row["configurations"]:
+        return ""
+    
     name = row["name"]
     default_config = row["default-configuration"]
 
@@ -198,7 +214,7 @@ def create_version(row):
     settings = ""
     for version_item in row["versions"]:
         version = version_item["version"]
-        if "configurations" in row:
+        if "configurations" in row and "all" in row["configurations"]:
             configs = []
             for config_item in row["configurations"]["all"]:
                 config = config_item["name"]
@@ -219,7 +235,7 @@ def create_version(row):
 def create_version_with_configurations(row, dir):
     name = row["name"]
 
-    if "configurations" not in row:
+    if "configurations" not in row or "all" not in row["configurations"]:
         settings = ""
         for version_item in row["versions"]:
             version = version_item["version"]
@@ -256,6 +272,9 @@ def create_version_configs(row):
     if "configurations" not in row:
         return ""
 
+    if "all" not in row["configurations"]:
+        return ""
+    
     name = row["name"]
     settings = ""
     for config_item in row["configurations"]["all"]:
@@ -415,6 +434,9 @@ def create_platform_aliases(name, version_item, actions):
 def create_configuration_args(row):
     if "configurations" not in row:
         return ""
+    
+    if "all" not in row["configurations"]:
+        return ""
 
     action_to_args = {}
 
@@ -442,6 +464,39 @@ def create_configuration_args(row):
 
     return cc_args
 
+def create_os_configuration_args(row):
+    if "configurations" not in row:
+        return ""
+    
+    if "os" not in row["configurations"]:
+        return ""
+
+    action_to_args = {}
+    
+    name = row["name"]
+    for config_item in row["configurations"]["os"]:
+        config = config_item["name"]
+        for action_item in config_item["actions"]:
+            action = action_item["name"]
+            args = ""
+            args += f"        \"@platforms//os:{config}\": [\n"
+            for arg in action_item["args"]:
+                args += f"            \"{arg}\",\n"
+            args += "        ],\n"
+
+            if action not in action_to_args:
+                action_to_args[action] = ""
+            action_to_args[action] += args
+
+    cc_args = ""
+    for action, args in action_to_args.items():
+        cc_args += cc_arg_os_tpl.format(
+            action=action,
+            args=args.strip()
+        )
+
+    return cc_args
+
 def generate_build_files(dir, actions):
     with open(f'repo_gen/{dir}/BUILD.tpl', 'r') as file:
         build_tpl = file.read()
@@ -454,6 +509,7 @@ def generate_build_files(dir, actions):
         with open(f"{dir}/{name}/BUILD", 'w') as file:
             build = build_tpl.format(name = name)
             build += create_configuration_args(config)
+            build += create_os_configuration_args(config)
             build += create_version_aliases(config, dir, actions)
             build += create_top_level_config_settings_group(config)
             build += create_version_configs(config)

repo_gen/toolchain.json

@@ -18,6 +18,43 @@
                     }
                 ]
             }
-        ]
+        ],
+        "configurations": {
+            "os": [
+                {
+                    "name": "linux",
+                    "actions": [
+                        {
+                            "name": "c_compile",
+                            "args": [
+                                "-nostdinc",
+                                "-nostdlib",
+                                "-nodefaultlibs"
+                            ]
+                        },
+                        {
+                            "name": "cpp_compile_actions",
+                            "args": [
+                                "-nostdinc",
+                                "-nostdlib",
+                                "-nodefaultlibs",
+                                "-nostdinc++",
+                                "-nostdlib++"
+                            ]
+                        },
+                        {
+                            "name": "link_actions",
+                            "args": [
+                                "-nostdinc",
+                                "-nostdlib",
+                                "-nodefaultlibs",
+                                "-nostdinc++",
+                                "-nostdlib++"
+                            ]
+                        }
+                    ]
+                }
+            ]
+        }
     }
 ]

repo_gen/toolchain/BUILD.tpl

@@ -1,4 +1,20 @@
 load("@bazel_skylib//lib:selects.bzl", "selects")
+load("@rules_cc//cc/toolchains:args.bzl", "cc_args")
+load("@rules_cc//cc/toolchains:args_list.bzl", "cc_args_list")
 
 package(default_visibility = ["//toolchain:__subpackages__"])
 
+cc_args_list(
+    name = "args",
+    args =
+        select({{
+            ":{name}": [
+                ":llvm-c_compile",
+                ":llvm-cpp_compile_actions",
+                ":llvm-link_actions",
+            ],
+            "//conditions:default": [],
+        }}),
+    visibility = ["//toolchain:__pkg__"],
+)
+

runtimes/BUILD

@@ -10,51 +10,7 @@ load("@rules_cc//cc/toolchains:args_list.bzl", "cc_args_list")
 cc_args_list(
     name = "args",
     args = [
-        ":nostd",
-        ":nostd++",
-        ":nostd_link",
         "//runtimes/musl:args",
     ],
     visibility = ["//:__pkg__"],
 )
-
-cc_args(
-    name = "nostd",
-    actions = [
-        "@rules_cc//cc/toolchains/actions:c_compile",
-        "@rules_cc//cc/toolchains/actions:cpp_compile_actions",
-    ],
-    args = [
-        "-nostdinc",
-        "-nostdlib",
-        "-nodefaultlibs",
-    ],
-    visibility = ["//visibility:public"],
-)
-
-cc_args(
-    name = "nostd++",
-    actions = [
-        "@rules_cc//cc/toolchains/actions:cpp_compile_actions",
-    ],
-    args = [
-        "-nostdinc++",
-        "-nostdlib++",
-    ],
-    visibility = ["//visibility:public"],
-)
-
-cc_args(
-    name = "nostd_link",
-    actions = [
-        "@rules_cc//cc/toolchains/actions:link_actions",
-    ],
-    args = [
-        "-nostdinc",
-        "-nostdlib",
-        "-nodefaultlibs",
-        "-nostdinc++",
-        "-nostdlib++",
-    ],
-    visibility = ["//visibility:public"],
-)

toolchain/BUILD

@@ -1,6 +1,15 @@
+load("@rules_cc//cc/toolchains:args_list.bzl", "cc_args_list")
 load("@rules_cc//cc/toolchains:tool.bzl", "cc_tool")
 load("@rules_cc//cc/toolchains:tool_map.bzl", "cc_tool_map")
 
+cc_args_list(
+    name = "args",
+    args = [
+        "//toolchain/llvm:args",
+    ],
+    visibility = ["//:__pkg__"],
+)
+
 cc_tool_map(
     name = "all_tools",
     tools = {

toolchain/llvm/BUILD

@@ -1,7 +1,69 @@
 load("@bazel_skylib//lib:selects.bzl", "selects")
+load("@rules_cc//cc/toolchains:args.bzl", "cc_args")
+load("@rules_cc//cc/toolchains:args_list.bzl", "cc_args_list")
 
 package(default_visibility = ["//toolchain:__subpackages__"])
 
+cc_args_list(
+    name = "args",
+    args =
+        select({
+            ":llvm": [
+                ":llvm-c_compile",
+                ":llvm-cpp_compile_actions",
+                ":llvm-link_actions",
+            ],
+            "//conditions:default": [],
+        }),
+    visibility = ["//toolchain:__pkg__"],
+)
+
+cc_args(
+    name = "llvm-c_compile",
+    actions = [
+        "@rules_cc//cc/toolchains/actions:c_compile",
+    ],
+    args = select({
+        "@platforms//os:linux": [
+            "-nostdinc",
+            "-nostdlib",
+            "-nodefaultlibs",
+        ],
+    }),
+)
+
+cc_args(
+    name = "llvm-cpp_compile_actions",
+    actions = [
+        "@rules_cc//cc/toolchains/actions:cpp_compile_actions",
+    ],
+    args = select({
+        "@platforms//os:linux": [
+            "-nostdinc",
+            "-nostdlib",
+            "-nodefaultlibs",
+            "-nostdinc++",
+            "-nostdlib++",
+        ],
+    }),
+)
+
+cc_args(
+    name = "llvm-link_actions",
+    actions = [
+        "@rules_cc//cc/toolchains/actions:link_actions",
+    ],
+    args = select({
+        "@platforms//os:linux": [
+            "-nostdinc",
+            "-nostdlib",
+            "-nodefaultlibs",
+            "-nostdinc++",
+            "-nostdlib++",
+        ],
+    }),
+)
+
 alias(
     name = "ar_actions",
     actual = select({