Patch uber toolchain

Author: AlexTereshenkov

MODULE.bazel

@@ -9,13 +9,20 @@ http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "ht
 bazel_dep(name = "platforms", version = "0.0.11")
 bazel_dep(name = "rules_shell", version = "0.5.0")
 bazel_dep(name = "rules_cc", version = "0.2.16")
-bazel_dep(name = "hermetic_cc_toolchain", version = "4.0.0")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "rules_oci", version = "2.2.6")
 bazel_dep(name = "rules_python", version = "1.5.1")
 bazel_dep(name = "pybind11_bazel", version = "3.0.0")
 bazel_dep(name = "rules_go", version = "0.59.0")
 
+# Toolchains
+bazel_dep(name = "hermetic_cc_toolchain", version = "4.0.0")
+single_version_override(
+    module_name = "hermetic_cc_toolchain",
+    patch_strip = 1,
+    patches = ["patches/toolchains/uber-hermetic-toolchain/bazel-9-compatibility.patch"],
+)
+
 # Third-party packages
 bazel_dep(name = "googletest", version = "1.17.0.bcr.2")  # gtest
 bazel_dep(name = "catch2", version = "3.12.0")
@@ -44,10 +51,10 @@ bazel_dep(name = "hedron_compile_commands", dev_dependency = True)
 git_override(
     module_name = "hedron_compile_commands",
     commit = "4f28899228fb3ad0126897876f147ca15026151e",
-    remote = "https://github.com/hedronvision/bazel-compile-commands-extractor.git",
     # `patch -p1` command to strip `a/filename` in `.patch` files generated by Git
     patch_strip = 1,
     patches = ["patches/hedron_compile_commands/bazel-9-compatibility.patch"],
+    remote = "https://github.com/hedronvision/bazel-compile-commands-extractor.git",
 )
 
 # Configure and register the toolchain.

patches/toolchains/uber-hermetic-toolchain/bazel-9-compatibility.patch

@@ -0,0 +1,53 @@
+diff --git a/MODULE.bazel b/MODULE.bazel
+index cfca164..cbc6933 100644
+--- a/MODULE.bazel
++++ b/MODULE.bazel
+@@ -5,6 +5,7 @@ module(
+ 
+ bazel_dep(name = "bazel_features", version = "1.21.0")
+ bazel_dep(name = "platforms", version = "0.0.10")
++bazel_dep(name = "rules_cc", version = "0.2.14")
+ 
+ bazel_dep(name = "rules_go", version = "0.54.0", dev_dependency = True)
+ 
+diff --git a/toolchain/private/cc_toolchains.bzl b/toolchain/private/cc_toolchains.bzl
+index 68c4c2f..efadf18 100644
+--- a/toolchain/private/cc_toolchains.bzl
++++ b/toolchain/private/cc_toolchains.bzl
+@@ -1,4 +1,5 @@
+ load("@hermetic_cc_toolchain//toolchain:zig_cc_toolchain.bzl", "zig_cc_toolchain_config")
++load("@rules_cc//cc/toolchains:cc_toolchain.bzl", "cc_toolchain")
+ load(":defs.bzl", "target_structs", "zig_tool_path")
+ 
+ def declare_cc_toolchains(os, zig_sdk_path):
+@@ -54,7 +55,7 @@ def declare_cc_toolchains(os, zig_sdk_path):
+             visibility = ["//visibility:private"],
+         )
+ 
+-        native.cc_toolchain(
++        cc_toolchain(
+             name = zigtarget + "_cc",
+             toolchain_identifier = zigtarget + "-toolchain",
+             toolchain_config = ":%s_cc_config" % zigtarget,
+diff --git a/toolchain/zig_cc_toolchain.bzl b/toolchain/zig_cc_toolchain.bzl
+index cebe72b..72fa0c2 100644
+--- a/toolchain/zig_cc_toolchain.bzl
++++ b/toolchain/zig_cc_toolchain.bzl
+@@ -1,6 +1,6 @@
+-load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "ACTION_NAMES")
++load("@rules_cc//cc:action_names.bzl", "ACTION_NAMES")
+ load(
+-    "@bazel_tools//tools/cpp:cc_toolchain_config_lib.bzl",
++    "@rules_cc//cc:cc_toolchain_config_lib.bzl",
+     "artifact_name_pattern",
+     "feature",
+     "feature_set",
+@@ -9,6 +9,8 @@ load(
+     "tool",
+     "tool_path",
+ )
++load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
++load("@rules_cc//cc/toolchains:cc_toolchain_config_info.bzl", "CcToolchainConfigInfo")
+ 
+ all_link_actions = [
+     ACTION_NAMES.cpp_link_executable,