Skip to content

More Bazel 8 compatibility #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 6, 2025
Merged

More Bazel 8 compatibility #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8548cb1
Migrate clang20 toolchain
martin4861 Aug 5, 2025
9d76a97
Set sysroots
martin4861 Aug 5, 2025
868e5c7
Update wrappers
martin4861 Aug 5, 2025
a5ce4ab
Update more wrappers
martin4861 Aug 5, 2025
fb21b6a
Set sysroot
martin4861 Aug 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cc/toolchains/gcc_arm_embedded/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@ config(
"//conditions:default": [],
},
),
sysroot = select({
"@rules_swiftnav//cc:_enable_bzlmod": "external/rules_swiftnav++swift_cc_toolchain_extension+gcc_arm_embedded_toolchain",
"//conditions:default": "external/gcc_arm_embedded_toolchain",
}),
)

cc_toolchain(
Expand Down
3 changes: 2 additions & 1 deletion cc/toolchains/gcc_arm_embedded/config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def _impl(ctx):
flag_groups = ([
flag_group(
flags = [
"--sysroot=external/gcc_arm_embedded_toolchain",
"--sysroot={}".format(ctx.attr.sysroot),
"-no-canonical-prefixes",
"-fno-canonical-system-headers",
"-fno-common",
Expand Down Expand Up @@ -167,6 +167,7 @@ config = rule(
attrs = {
"c_opts": attr.string_list(),
"link_opts": attr.string_list(),
"sysroot": attr.string(),
},
provides = [CcToolchainConfigInfo],
)
2 changes: 1 addition & 1 deletion cc/toolchains/llvm/aarch64-linux/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ fi

tool_name=$(basename "${BASH_SOURCE[0]}")
toolchain_bindir=external/aarch64-linux-llvm/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~aarch64-linux-llvm/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-linux-llvm/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
2 changes: 1 addition & 1 deletion cc/toolchains/llvm20/aarch64-darwin/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ tool_name=$(basename "${BASH_SOURCE[0]}")
# In case the tool label is changed, a change in here is very likely needed
# This establishes backwards compatibility with the old WORKSPACE file
toolchain_bindir=external/aarch64-darwin-llvm20/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~aarch64-darwin-llvm20/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-darwin-llvm20/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
2 changes: 1 addition & 1 deletion cc/toolchains/llvm20/aarch64-linux/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ tool_name=$(basename "${BASH_SOURCE[0]}")
# In case the tool label is changed, a change in here is very likely needed
# This establishes backwards compatibility with the old WORKSPACE file
toolchain_bindir=external/aarch64-linux-llvm20/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~aarch64-linux-llvm20/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-linux-llvm20/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
2 changes: 1 addition & 1 deletion cc/toolchains/llvm20/x86_64-aarch64-linux/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ cc_toolchain_config(
abi_version = "clang",
builtin_sysroot = select({
# Remove once bzlmod is enabled by default
"@rules_swiftnav//cc:_enable_bzlmod": "external/rules_swiftnav~~swift_cc_toolchain_extension~aarch64-sysroot",
"@rules_swiftnav//cc:_enable_bzlmod": "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-sysroot",
"//conditions:default": "external/aarch64-sysroot",
}),
compiler = "clang",
Expand Down
2 changes: 1 addition & 1 deletion cc/toolchains/llvm20/x86_64-aarch64-linux/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ tool_name=$(basename "${BASH_SOURCE[0]}")
# In case the tool label is changed, a change in here is very likely needed
# This establishes backwards compatibility with the old WORKSPACE file
toolchain_bindir=external/x86_64-linux-llvm20/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~x86_64-linux-llvm20/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-linux-llvm20/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
2 changes: 1 addition & 1 deletion cc/toolchains/llvm20/x86_64-darwin/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ tool_name=$(basename "${BASH_SOURCE[0]}")
# In case the tool label is changed, a change in here is very likely needed
# This establishes backwards compatibility with the old WORKSPACE file
toolchain_bindir=external/x86_64-darwin-llvm20/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~x86_64-darwin-llvm20/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-darwin-llvm20/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
2 changes: 1 addition & 1 deletion cc/toolchains/llvm20/x86_64-linux/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ cc_toolchain_config(
builtin_sysroot = select({
"@rules_swiftnav//cc:_use_libcpp": None,
# Remove once bzlmod is enabled by default
"@rules_swiftnav//cc:_enable_bzlmod": "external/rules_swiftnav~~swift_cc_toolchain_extension~x86_64-sysroot",
"@rules_swiftnav//cc:_enable_bzlmod": "external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-sysroot",
"//conditions:default": "external/x86_64-sysroot",
}),
compiler = "clang",
Expand Down
2 changes: 1 addition & 1 deletion cc/toolchains/llvm20/x86_64-linux/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ tool_name=$(basename "${BASH_SOURCE[0]}")
# In case the tool label is changed, a change in here is very likely needed
# This establishes backwards compatibility with the old WORKSPACE file
toolchain_bindir=external/x86_64-linux-llvm20/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~x86_64-linux-llvm20/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-linux-llvm20/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
8 changes: 7 additions & 1 deletion cc/toolchains/musl/aarch64/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,13 @@ filegroup(
tags = ["manual"],
)

config(name = "config")
config(
name = "config",
sysroot = select({
"@rules_swiftnav//cc:_enable_bzlmod": "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-linux-musl",
"//conditions:default": "external/aarch64-linux-musl",
}),
)

cc_toolchain(
name = "cc_toolchain",
Expand Down
8 changes: 5 additions & 3 deletions cc/toolchains/musl/aarch64/config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def _impl(ctx):
flag_groups = ([
flag_group(
flags = [
"--sysroot=external/aarch64-linux-musl",
"--sysroot={}".format(ctx.attr.sysroot),
"-no-canonical-prefixes",
"-fno-canonical-system-headers",
"-fno-common",
Expand Down Expand Up @@ -120,7 +120,7 @@ def _impl(ctx):
flag_groups = ([
flag_group(
flags = [
"--sysroot=external/aarch64-linux-musl",
"--sysroot={}".format(ctx.attr.sysroot),
"-Wl,-O1",
"-Wl,--hash-style=gnu",
"-Wl,--as-needed",
Expand Down Expand Up @@ -152,6 +152,8 @@ def _impl(ctx):

config = rule(
implementation = _impl,
attrs = {},
attrs = {
"sysroot": attr.string(),
},
provides = [CcToolchainConfigInfo],
)
2 changes: 1 addition & 1 deletion cc/toolchains/musl/aarch64/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ fi

tool_name=$(basename "${BASH_SOURCE[0]}")
toolchain_bindir=external/aarch64-linux-musl/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~aarch64-linux-musl/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-linux-musl/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
8 changes: 7 additions & 1 deletion cc/toolchains/musl/armhf/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,13 @@ filegroup(
tags = ["manual"],
)

config(name = "config")
config(
name = "config",
sysroot = select({
"@rules_swiftnav//cc:_enable_bzlmod": "external/rules_swiftnav++swift_cc_toolchain_extension+arm-linux-musleabihf",
"//conditions:default": "external/arm-linux-musleabihf",
}),
)

cc_toolchain(
name = "cc_toolchain",
Expand Down
8 changes: 5 additions & 3 deletions cc/toolchains/musl/armhf/config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def _impl(ctx):
flag_groups = ([
flag_group(
flags = [
"--sysroot=external/arm-linux-musleabihf",
"--sysroot={}".format(ctx.attr.sysroot),
"-no-canonical-prefixes",
"-fno-canonical-system-headers",
"-fno-common",
Expand Down Expand Up @@ -120,7 +120,7 @@ def _impl(ctx):
flag_groups = ([
flag_group(
flags = [
"--sysroot=external/arm-linux-musleabihf",
"--sysroot={}".format(ctx.attr.sysroot),
"-Wl,-O1",
"-Wl,--hash-style=gnu",
"-Wl,--as-needed",
Expand Down Expand Up @@ -152,6 +152,8 @@ def _impl(ctx):

config = rule(
implementation = _impl,
attrs = {},
attrs = {
"sysroot": attr.string(),
},
provides = [CcToolchainConfigInfo],
)
2 changes: 1 addition & 1 deletion cc/toolchains/musl/armhf/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ fi

tool_name=$(basename "${BASH_SOURCE[0]}")
toolchain_bindir=external/arm-linux-musleabihf/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~arm-linux-musleabihf/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+arm-linux-musleabihf/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
8 changes: 7 additions & 1 deletion cc/toolchains/musl/x86_64/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,13 @@ filegroup(
tags = ["manual"],
)

config(name = "config")
config(
name = "config",
sysroot = select({
"@rules_swiftnav//cc:_enable_bzlmod": "external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-linux-musl",
"//conditions:default": "external/x86_64-linux-musl",
}),
)

cc_toolchain(
name = "cc_toolchain",
Expand Down
8 changes: 5 additions & 3 deletions cc/toolchains/musl/x86_64/config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def _impl(ctx):
flag_groups = ([
flag_group(
flags = [
"--sysroot=external/x86_64-linux-musl",
"--sysroot={}".format(ctx.attr.sysroot),
"-no-canonical-prefixes",
"-fno-canonical-system-headers",
"-fno-common",
Expand Down Expand Up @@ -120,7 +120,7 @@ def _impl(ctx):
flag_groups = ([
flag_group(
flags = [
"--sysroot=external/x86_64-linux-musl",
"--sysroot={}".format(ctx.attr.sysroot),
"-Wl,-O1",
"-Wl,--hash-style=gnu",
"-Wl,--as-needed",
Expand Down Expand Up @@ -152,6 +152,8 @@ def _impl(ctx):

config = rule(
implementation = _impl,
attrs = {},
attrs = {
"sysroot": attr.string(),
},
provides = [CcToolchainConfigInfo],
)
2 changes: 1 addition & 1 deletion cc/toolchains/musl/x86_64/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ fi

tool_name=$(basename "${BASH_SOURCE[0]}")
toolchain_bindir=external/x86_64-linux-musl/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~x86_64-linux-musl/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-linux-musl/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
Loading