Skip to content

Commit 13e310d

Browse files
mattyclarksonalextercete
authored andcommitted
Support Bazel 9
1 parent 5020492 commit 13e310d

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

MODULE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ module(
55

66
bazel_dep(name = "bazel_features", version = "1.21.0")
77
bazel_dep(name = "platforms", version = "0.0.10")
8+
bazel_dep(name = "rules_cc", version = "0.2.14")
89

910
bazel_dep(name = "rules_go", version = "0.54.0", dev_dependency = True)
1011

toolchain/defs.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
22
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "read_user_netrc", "use_netrc")
3+
load("@hermetic_cc_toolchain//toolchain:utils.bzl", "quote")
34
load("@hermetic_cc_toolchain//toolchain/private:defs.bzl", "target_structs", "transform_os_name", "zig_tool_path")
45
load("@hermetic_cc_toolchain//toolchain/private:repositories.bzl", "zig_sdk_repository")
5-
load("@hermetic_cc_toolchain//toolchain:utils.bzl", "quote")
66
load(
77
"@hermetic_cc_toolchain//toolchain/private:zig_sdk.bzl",
88
"HOST_PLATFORM_SHA256",

toolchain/private/cc_toolchains.bzl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
load("@hermetic_cc_toolchain//toolchain:zig_cc_toolchain.bzl", "zig_cc_toolchain_config")
2+
load("@rules_cc//cc/toolchains:cc_toolchain.bzl", "cc_toolchain")
23
load(":defs.bzl", "target_structs", "zig_tool_path")
34

45
def declare_cc_toolchains(os, zig_sdk_path):
@@ -54,7 +55,7 @@ def declare_cc_toolchains(os, zig_sdk_path):
5455
visibility = ["//visibility:private"],
5556
)
5657

57-
native.cc_toolchain(
58+
cc_toolchain(
5859
name = zigtarget + "_cc",
5960
toolchain_identifier = zigtarget + "-toolchain",
6061
toolchain_config = ":%s_cc_config" % zigtarget,

toolchain/private/repositories.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("@hermetic_cc_toolchain//toolchain/private:defs.bzl", "transform_arch_name", "transform_os_name")
21
load("@hermetic_cc_toolchain//toolchain:utils.bzl", "quote")
2+
load("@hermetic_cc_toolchain//toolchain/private:defs.bzl", "transform_arch_name", "transform_os_name")
33

44
def _define_zig_toolchains(repository_ctx, configs, package = ""):
55
extra_target_settings = "[" + " ".join([quote(str(setting)) + "," for setting in repository_ctx.attr.extra_target_settings]) + "]"

toolchain/zig_cc_toolchain.bzl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "ACTION_NAMES")
1+
load("@rules_cc//cc:action_names.bzl", "ACTION_NAMES")
22
load(
3-
"@bazel_tools//tools/cpp:cc_toolchain_config_lib.bzl",
3+
"@rules_cc//cc:cc_toolchain_config_lib.bzl",
44
"artifact_name_pattern",
55
"feature",
66
"feature_set",
@@ -9,6 +9,8 @@ load(
99
"tool",
1010
"tool_path",
1111
)
12+
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
13+
load("@rules_cc//cc/toolchains:cc_toolchain_config_info.bzl", "CcToolchainConfigInfo")
1214

1315
all_link_actions = [
1416
ACTION_NAMES.cpp_link_executable,

0 commit comments

Comments
 (0)