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..5e4aad9 100644 --- a/toolchain/zig_cc_toolchain.bzl +++ b/toolchain/zig_cc_toolchain.bzl @@ -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,