Add rules based toolchain

.bazelrc

@@ -1,5 +1,7 @@
 common --enable_platform_specific_config
 
+common --repo_env=APPLE_SUPPORT_RULES_BASED_TOOLCHAIN=1
+
 common --repo_env=BAZEL_CONLYOPTS=-DCONLY_ENV=1
 common --repo_env=BAZEL_COPTS=-DCOPTS_ENV=1
 common --repo_env=BAZEL_CXXOPTS="-std=c++17:-DCXXOPTS_ENV=1"

MODULE.bazel

@@ -10,7 +10,25 @@ module(
 bazel_dep(name = "bazel_features", version = "1.27.0")
 bazel_dep(name = "bazel_skylib", version = "1.3.0")
 bazel_dep(name = "platforms", version = "0.0.9")
-bazel_dep(name = "rules_cc", version = "0.2.15")
+bazel_dep(name = "rules_cc", version = "0.2.17")
+single_version_override(
+    module_name = "rules_cc",
+    patch_strip = 1,
+    patches = [
+        # https://github.com/bazelbuild/rules_cc/commit/f32fdf585dd07f67d9ef60cd2633960d0d8cb6a2
+        # https://github.com/bazelbuild/rules_cc/pull/614
+        # https://github.com/bazelbuild/rules_cc/pull/642
+        # https://github.com/bazelbuild/rules_cc/pull/645
+        # https://github.com/bazelbuild/rules_cc/pull/647
+        # https://github.com/bazelbuild/rules_cc/pull/648
+        # https://github.com/bazelbuild/rules_cc/pull/658
+        # https://github.com/bazelbuild/rules_cc/pull/659
+        # https://github.com/bazelbuild/rules_cc/pull/660
+        "//:rules_cc.patch",
+        # https://github.com/bazelbuild/rules_cc/pull/667
+        "//:rules_cc_legacy_tool.patch",
+    ],
+)
 
 apple_cc_configure = use_extension("//crosstool:setup.bzl", "apple_cc_configure_extension")
 use_repo(apple_cc_configure, "local_config_apple_cc", "local_config_apple_cc_toolchains")
@@ -31,3 +49,7 @@ use_repo(
     "http_dmg_test_krita",
     "http_dmg_test_krita_strip_prefix",
 )
+
+toolchain_env = use_repo_rule("//toolchain:toolchain_env.bzl", "toolchain_env")
+
+toolchain_env(name = "apple_support_toolchain_env")

crosstool/BUILD

@@ -52,6 +52,43 @@ force_exec(
     target = ":exec_cc_wrapper.target_config",
 )
 
+# TODO: Attempt to remove need for wrapper
+genrule(
+    name = "exec_strip.target_config",
+    srcs = ["strip.sh"],
+    outs = ["strip"],
+    cmd = "cp $(SRCS) $(OUTS)",
+)
+
+force_exec(
+    name = "exec_strip",
+    target = ":exec_strip.target_config",
+)
+
+genrule(
+    name = "exec_llvm_profdata.target_config",
+    srcs = ["llvm-profdata.sh"],
+    outs = ["llvm-profdata"],
+    cmd = "cp $(SRCS) $(OUTS)",
+)
+
+force_exec(
+    name = "exec_llvm_profdata",
+    target = ":exec_llvm_profdata.target_config",
+)
+
+genrule(
+    name = "exec_llvm_cov.target_config",
+    srcs = ["llvm-cov.sh"],
+    outs = ["llvm-cov"],
+    cmd = "cp $(SRCS) $(OUTS)",
+)
+
+force_exec(
+    name = "exec_llvm_cov",
+    target = ":exec_llvm_cov.target_config",
+)
+
 # Consumed by bazel tests.
 filegroup(
     name = "for_bazel_tests",

crosstool/BUILD.toolchains

@@ -14,7 +14,7 @@ _OSX_DEVELOPER_PLATFORM_CPUS = [
             "@platforms//cpu:" + cpu,
         ],
         target_compatible_with = APPLE_PLATFORMS_CONSTRAINTS[arch],
-        toolchain = "@local_config_apple_cc//:cc-compiler-" + arch,
+        toolchain = "%{label}".format(arch),
         toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
         visibility = ["//visibility:public"],
     )

crosstool/llvm-cov.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+exec xcrun llvm-cov "$@"

crosstool/llvm-profdata.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+exec xcrun llvm-profdata "$@"

crosstool/setup_internal.bzl

@@ -6,6 +6,7 @@ visibility("//lib/...")
 
 _DISABLE_ENV_VAR = "BAZEL_NO_APPLE_CPP_TOOLCHAIN"
 _OLD_DISABLE_ENV_VAR = "BAZEL_USE_CPP_ONLY_TOOLCHAIN"
+_NEW_TOOLCHAIN_VAR = "APPLE_SUPPORT_RULES_BASED_TOOLCHAIN"
 
 def _apple_cc_autoconf_toolchains_impl(repository_ctx):
     """Generate BUILD file with 'toolchain' targets for the local host C++ toolchain.
@@ -16,23 +17,34 @@ def _apple_cc_autoconf_toolchains_impl(repository_ctx):
     env = repository_ctx.os.environ
     should_disable = _DISABLE_ENV_VAR in env and env[_DISABLE_ENV_VAR] == "1"
     old_should_disable = _OLD_DISABLE_ENV_VAR in env and env[_OLD_DISABLE_ENV_VAR] == "1"
+    use_new_toolchain = _NEW_TOOLCHAIN_VAR in env and env[_NEW_TOOLCHAIN_VAR] == "1"
 
     if should_disable or old_should_disable:
         repository_ctx.file("BUILD", "# Apple CC toolchain autoconfiguration was disabled by {} env variable.".format(
             _DISABLE_ENV_VAR if should_disable else _OLD_DISABLE_ENV_VAR,
         ))
+    elif use_new_toolchain:
+        repository_ctx.template(
+            "BUILD",
+            Label("@build_bazel_apple_support//crosstool:BUILD.toolchains"),
+            {
+                "%{label}": "@build_bazel_apple_support//toolchain",
+            },
+        )
     else:
-        repository_ctx.file(
+        repository_ctx.template(
             "BUILD",
-            content = repository_ctx.read(
-                Label("@build_bazel_apple_support//crosstool:BUILD.toolchains"),
-            ),
+            Label("@build_bazel_apple_support//crosstool:BUILD.toolchains"),
+            {
+                "%{label}": "@local_config_apple_cc//:cc-compiler-{}",
+            },
         )
 
 apple_cc_autoconf_toolchains = repository_rule(
     environ = [
         _DISABLE_ENV_VAR,
         _OLD_DISABLE_ENV_VAR,
+        _NEW_TOOLCHAIN_VAR,
     ],
     implementation = _apple_cc_autoconf_toolchains_impl,
     configure = True,
@@ -42,8 +54,9 @@ def _apple_cc_autoconf_impl(repository_ctx):
     env = repository_ctx.os.environ
     should_disable = _DISABLE_ENV_VAR in env and env[_DISABLE_ENV_VAR] == "1"
     old_should_disable = _OLD_DISABLE_ENV_VAR in env and env[_OLD_DISABLE_ENV_VAR] == "1"
+    use_new_toolchain = _NEW_TOOLCHAIN_VAR in env and env[_NEW_TOOLCHAIN_VAR] == "1"
 
-    if should_disable or old_should_disable:
+    if should_disable or old_should_disable or use_new_toolchain:
         repository_ctx.file("BUILD", "# Apple CC autoconfiguration was disabled by {} env variable.".format(
             _DISABLE_ENV_VAR if should_disable else _OLD_DISABLE_ENV_VAR,
         ))
@@ -54,6 +67,7 @@ def _apple_cc_autoconf_impl(repository_ctx):
 
 apple_cc_autoconf = repository_rule(
     environ = [
+        _NEW_TOOLCHAIN_VAR,
         _DISABLE_ENV_VAR,
         _OLD_DISABLE_ENV_VAR,
         "APPLE_SUPPORT_LAYERING_CHECK_BETA",

crosstool/strip.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+exec xcrun strip "$@"