Skip to content

Provide Bazel 8 compatibility #169

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 3 commits into from
Aug 4, 2025
Merged

Provide Bazel 8 compatibility #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eece4a0
Allow empty globs
martin4861 Aug 4, 2025
3701462
Use + instead of ~ as bzl_mod path seperator
martin4861 Aug 4, 2025
86fc57a
Bump MODULE version
martin4861 Aug 4, 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
2 changes: 1 addition & 1 deletion MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

module(
name = "rules_swiftnav",
version = "0.2.0",
version = "0.3.0",
compatibility_level = 1,
)

Expand Down
2 changes: 1 addition & 1 deletion cc/toolchains/gcc_arm_embedded/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_gcc_arm_embedded_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~x86_64_linux_gcc_arm_embedded_toolchain/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+x86_64_linux_gcc_arm_embedded_toolchain/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/gcc_arm_gnu_8_3/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ filegroup(
config(
name = "config",
sysroot = select({
"@rules_swiftnav//cc:_enable_bzlmod": "external/rules_swiftnav~~swift_cc_toolchain_extension~gcc_arm_gnu_8_3_toolchain/aarch64-linux-gnu/libc",
"@rules_swiftnav//cc:_enable_bzlmod": "external/rules_swiftnav++swift_cc_toolchain_extension+gcc_arm_gnu_8_3_toolchain/aarch64-linux-gnu/libc",
"//conditions:default": "external/gcc_arm_gnu_8_3_toolchain/aarch64-linux-gnu/libc",
}),
)
Expand Down
2 changes: 1 addition & 1 deletion cc/toolchains/gcc_arm_gnu_8_3/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/gcc_arm_gnu_8_3_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~gcc_arm_gnu_8_3_toolchain/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+gcc_arm_gnu_8_3_toolchain/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/llvm/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-llvm/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~aarch64-darwin-llvm/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-darwin-llvm/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
7 changes: 4 additions & 3 deletions cc/toolchains/llvm/llvm.BUILD.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ exports_files(glob([
"bin/*",
"lib/*",
"include/*",
]))
], allow_empty = True))

## LLVM toolchain files

Expand All @@ -36,7 +36,7 @@ filegroup(
"bin/ld.lld",
# Required on mac
"bin/ld64.lld",
]),
], allow_empty = True),
)

filegroup(
Expand All @@ -49,7 +49,7 @@ filegroup(

filegroup(
name = "bin",
srcs = glob(["bin/**"]),
srcs = glob(["bin/**"], allow_empty = True),
)

filegroup(
Expand All @@ -66,6 +66,7 @@ filegroup(
"lib/libclang*.a",
"lib/liblld*.a",
],
allow_empty = True,
),
# Do not include the .dylib files in the linker sandbox because they will
# not be available at runtime. Any library linked from the toolchain should
Expand Down
2 changes: 1 addition & 1 deletion cc/toolchains/llvm/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/llvm/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-llvm/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~x86_64-linux-llvm/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-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/llvm_x86_64_windows/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ filegroup(
config(
name = "config",
sysroot = select({
"@rules_swiftnav//cc:_enable_bzlmod": "external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain",
"@rules_swiftnav//cc:_enable_bzlmod": "external/rules_swiftnav++swift_cc_toolchain_extension+llvm_mingw_toolchain",
"//conditions:default": "external/llvm_mingw_toolchain",
}),
)
Expand Down
2 changes: 1 addition & 1 deletion cc/toolchains/llvm_x86_64_windows/wrappers/wrappers
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/llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+llvm_mingw_toolchain/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/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-ar
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/llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+llvm_mingw_toolchain/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/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-as
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/llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+llvm_mingw_toolchain/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/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-clang
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/llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+llvm_mingw_toolchain/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/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-cpp
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/llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+llvm_mingw_toolchain/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/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-g++
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/llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+llvm_mingw_toolchain/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/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-gcc
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/llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+llvm_mingw_toolchain/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/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-gcov
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/llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+llvm_mingw_toolchain/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/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-ld
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/llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+llvm_mingw_toolchain/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/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-nm
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/llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+llvm_mingw_toolchain/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/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-objcopy
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/llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+llvm_mingw_toolchain/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/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-objdump
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/llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+llvm_mingw_toolchain/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/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-ranlib
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/llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+llvm_mingw_toolchain/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/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-strip
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/llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+llvm_mingw_toolchain/bin"

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