Fix docs for capabilities

bazelbuild · Feb 4, 2025 · 7d2851e · 7d2851e
1 parent 187afc0
commit 7d2851e
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 4 deletions.
diff --git a/cc/toolchains/tool_capability.bzl b/cc/toolchains/tool_capability.bzl
@@ -69,8 +69,12 @@ cc_tool(
 
 cc_args(
     name = "pic",
-    requires = [
-        "//cc/toolchains/capabilities:supports_pic"
+    actions = [
+        # Applies to all C/C++ compile actions.
+        "@rules_cc//cc/toolchains/actions:compile_actions",
+    ],
+    requires_any_of = [
+        "@rules_cc//cc/toolchains/capabilities:supports_pic"
     ],
     args = ["-fPIC"],
 )

diff --git a/docs/toolchain_api.md b/docs/toolchain_api.md
@@ -464,8 +464,12 @@ cc_tool(
 
 cc_args(
     name = "pic",
-    requires = [
-        "@rules_cc//cc/toolchains/capabilities:supports_pic"
+    actions = [
+        # Applies to all C/C++ compile actions.
+        "@rules_cc//cc/toolchains/actions:compile_actions",
+    ],
+    requires_any_of = [
+        "//cc/toolchains/capabilities:supports_pic"
     ],
     args = ["-fPIC"],
 )

diff --git a/examples/rule_based_toolchain/toolchains/args/BUILD.bazel b/examples/rule_based_toolchain/toolchains/args/BUILD.bazel
@@ -40,3 +40,15 @@ cc_args(
     }),
     visibility = ["//visibility:public"],
 )
+
+cc_args(
+    name = "pic",
+    actions = [
+        "@rules_cc//cc/toolchains/actions:c_compile",
+        "@rules_cc//cc/toolchains/actions:cpp_compile_actions",
+    ],
+    args = ["-fPIC"],
+    requires_any_of = [
+        "@rules_cc//cc/toolchains/capabilities:supports_pic",
+    ],
+)
diff --git a/examples/rule_based_toolchain/toolchains/clang/tools/BUILD.bazel b/examples/rule_based_toolchain/toolchains/clang/tools/BUILD.bazel
@@ -60,6 +60,9 @@ cc_tool(
         "//constraint:linux_aarch64": "@clang-linux-aarch64//:bin/clang",
         "//constraint:linux_x86_64": "@clang-linux-x86_64//:bin/clang",
     }),
+    capabilities = [
+        "@rules_cc//cc/toolchains/capabilities:supports_pic",
+    ],
     data = [
         ":exec_platform_builtin_headers",
         ":exec_platform_multicall_support_files",
@@ -72,6 +75,9 @@ cc_tool(
         "//constraint:linux_aarch64": "@clang-linux-aarch64//:bin/clang++",
         "//constraint:linux_x86_64": "@clang-linux-x86_64//:bin/clang++",
     }),
+    capabilities = [
+        "@rules_cc//cc/toolchains/capabilities:supports_pic",
+    ],
     data = [
         ":exec_platform_builtin_headers",
         ":exec_platform_multicall_support_files",