@@ -5,6 +5,7 @@ load("@rules_cc//cc/toolchains:make_variable.bzl", "cc_make_variable")
55load("@rules_cc//cc/toolchains:tool.bzl", "cc_tool")
66load("@rules_cc//cc/toolchains:tool_map.bzl", "cc_tool_map")
77load("@rules_cc//cc/toolchains:toolchain.bzl", "cc_toolchain")
8+ load("@rules_cc//cc/toolchains/args:sysroot.bzl", "cc_sysroot")
89load("@rules_swift//swift/toolchains:swift_toolchain.bzl", "swift_toolchain")
910load("@rules_swift//swift/toolchains:swift_tools.bzl", "swift_tools")
1011
@@ -123,29 +124,27 @@ cc_tool_map(
123124 },
124125)
125126
126- cc_args (
127- name = "non_hermetic_sysroot_args ",
127+ cc_sysroot (
128+ name = "linux_sysroot_args ",
128129 actions = [
129130 "@rules_cc//cc/toolchains/actions:link_actions",
130131 "@rules_cc//cc/toolchains/actions:compile_actions",
131132 ],
132- allowlist_absolute_include_directories = [
133- "/usr/include",
134- "/usr/local/include",
135- ],
133+ data = ["@swift_linux_sysroot//:root"],
134+ sysroot = "@swift_linux_sysroot//:root",
136135)
137136
138137cc_feature(
139- name = "non_hermetic_sysroot ",
140- args = [":non_hermetic_sysroot_args "],
138+ name = "linux_sysroot ",
139+ args = [":linux_sysroot_args "],
141140 feature_name = "sysroot",
142141)
143142
144143apple_cc_toolchain(
145144 name = "cc_toolchain_exec",
146145 module_map = None,
147146 supports_header_parsing = False,
148- sysroot_feature = ":non_hermetic_sysroot ",
147+ sysroot_feature = ":linux_sysroot ",
149148 target = select({
150149 "@platforms//cpu:aarch64": "aarch64-unknown-linux-gnu",
151150 "@platforms//cpu:x86_64": "x86_64-unknown-linux-gnu",
0 commit comments