Skip to content

Commit 8ed03ea

Browse files
committed
try heremetic version
1 parent 64bebd0 commit 8ed03ea

4 files changed

Lines changed: 850 additions & 9 deletions

File tree

MODULE.bazel

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ module(
99

1010
bazel_dep(name = "abseil-cpp", version = "20250814.1")
1111
bazel_dep(name = "apple_support", version = "2.6.1")
12+
bazel_dep(name = "bazel_linux_packages", version = "0.3.1")
1213
bazel_dep(name = "bazel_features", version = "1.51.0")
1314
bazel_dep(name = "bazel_skylib", version = "1.7.1")
1415
bazel_dep(name = "nlohmann_json", version = "3.12.0.bcr.1")
@@ -18,6 +19,19 @@ bazel_dep(name = "rules_cc", version = "0.2.14")
1819
bazel_dep(name = "rules_shell", version = "0.3.0")
1920
bazel_dep(name = "swift_argument_parser", version = "1.7.0")
2021

22+
apt = use_extension("@bazel_linux_packages//apt:extensions.bzl", "apt")
23+
apt.ubuntu(
24+
name = "swift_linux_sysroot",
25+
lockfile = "//swift/internal/extensions:ubuntu22.04_sysroot.lock.json",
26+
packages = [
27+
"libc6-dev",
28+
"libstdc++-11-dev",
29+
"linux-libc-dev",
30+
],
31+
suites = ["jammy"],
32+
)
33+
use_repo(apt, "swift_linux_sysroot")
34+
2135
swift_autoconfiguration = use_repo_rule("//swift/internal:swift_autoconfiguration.bzl", "swift_autoconfiguration")
2236

2337
swift_autoconfiguration(name = "rules_swift_local_config")
@@ -253,3 +267,10 @@ archive_override(
253267
"https://github.com/bazelbuild/apple_support/archive/17c7248ee2f4f21b2d1f3668d88e4f40d9453220.tar.gz",
254268
],
255269
)
270+
271+
single_version_override(
272+
module_name = "bazel_linux_packages",
273+
patch_strip = 1,
274+
patches = ["//third_party/patches:bazel-linux-packages-bazel-9.patch"],
275+
version = "0.3.1",
276+
)

swift/internal/extensions/toolchain.BUILD

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ load("@rules_cc//cc/toolchains:make_variable.bzl", "cc_make_variable")
55
load("@rules_cc//cc/toolchains:tool.bzl", "cc_tool")
66
load("@rules_cc//cc/toolchains:tool_map.bzl", "cc_tool_map")
77
load("@rules_cc//cc/toolchains:toolchain.bzl", "cc_toolchain")
8+
load("@rules_cc//cc/toolchains/args:sysroot.bzl", "cc_sysroot")
89
load("@rules_swift//swift/toolchains:swift_toolchain.bzl", "swift_toolchain")
910
load("@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

138137
cc_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

144143
apple_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

Comments
 (0)