Skip to content

Migrate to bzl_mod paths #197

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 2 commits into from
Oct 16, 2025
Merged

Migrate to bzl_mod paths #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d9291e
Migrate to bzl_mod paths
martin4861 Oct 15, 2025
e4ef309
Extend small_world with llvm20
martin4861 Oct 15, 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.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions cc/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,15 +206,6 @@ config_setting(
visibility = ["//visibility:public"],
)

config_setting(
name = "_enable_bzlmod_not_libcpp",
flag_values = {
":enable_bzlmod": "true",
":use_libcpp": "false",
},
visibility = ["//visibility:public"],
)

py_binary(
name = "fix_include_guards",
srcs = [
Expand Down
2 changes: 1 addition & 1 deletion cc/toolchains/llvm/aarch64-darwin/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(
"strip": "wrappers/llvm-strip",
},
toolchain_identifier = "clang-aarch64-darwin",
toolchain_path_prefix = "external/aarch64-darwin-llvm",
toolchain_path_prefix = "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-darwin-llvm",
use_lld = False,
)

Expand Down
6 changes: 2 additions & 4 deletions cc/toolchains/llvm/aarch64-linux/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,7 @@ cc_toolchain_config(
abi_version = "clang",
builtin_sysroot = select({
"@rules_swiftnav//cc:_use_libcpp": None,
# When bzlmod is enabled but libcpp is not, use the bzlmod path
"@rules_swiftnav//cc:_enable_bzlmod_not_libcpp": "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-sysroot",
"//conditions:default": "external/aarch64-sysroot",
"//conditions:default": "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-sysroot",
}),
compiler = "clang",
cxx_builtin_include_directories = select({
Expand Down Expand Up @@ -148,7 +146,7 @@ cc_toolchain_config(
"strip": "wrappers/llvm-strip",
},
toolchain_identifier = "clang-aarch64-linux",
toolchain_path_prefix = "external/aarch64-linux-llvm",
toolchain_path_prefix = "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-linux-llvm",
)

cc_toolchain(
Expand Down
6 changes: 2 additions & 4 deletions cc/toolchains/llvm/x86_64-aarch64-linux/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,7 @@ cc_toolchain_config(
abi_version = "clang",
builtin_sysroot = select({
"@rules_swiftnav//cc:_use_libcpp": None,
# When bzlmod is enabled but libcpp is not, use the bzlmod path
"@rules_swiftnav//cc:_enable_bzlmod_not_libcpp": "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-sysroot",
"//conditions:default": "external/aarch64-sysroot",
"//conditions:default": "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-sysroot",
}),
compiler = "clang",
cxx_builtin_include_directories = [
Expand Down Expand Up @@ -134,7 +132,7 @@ cc_toolchain_config(
"strip": "wrappers/llvm-strip",
},
toolchain_identifier = "clang-x86_64-linux",
toolchain_path_prefix = "external/x86_64-linux-llvm",
toolchain_path_prefix = "external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-linux-llvm",
)

cc_toolchain(
Expand Down
2 changes: 1 addition & 1 deletion cc/toolchains/llvm/x86_64-darwin/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ cc_toolchain_config(
"strip": "wrappers/llvm-strip",
},
toolchain_identifier = "clang-x86_64-darwin",
toolchain_path_prefix = "external/x86_64-darwin-llvm",
toolchain_path_prefix = "external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-darwin-llvm",
)

cc_toolchain(
Expand Down
6 changes: 2 additions & 4 deletions 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 @@ -117,9 +117,7 @@ cc_toolchain_config(
abi_version = "clang",
builtin_sysroot = select({
"@rules_swiftnav//cc:_use_libcpp": None,
# When bzlmod is enabled but libcpp is not, use the bzlmod path
"@rules_swiftnav//cc:_enable_bzlmod_not_libcpp": "external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-sysroot",
"//conditions:default": "external/x86_64-sysroot",
"//conditions:default": "external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-sysroot",
}),
compiler = "clang",
cxx_builtin_include_directories = select({
Expand Down Expand Up @@ -148,7 +146,7 @@ cc_toolchain_config(
"strip": "wrappers/llvm-strip",
},
toolchain_identifier = "clang-x86_64-linux",
toolchain_path_prefix = "external/x86_64-linux-llvm",
toolchain_path_prefix = "external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-linux-llvm",
)

cc_toolchain(
Expand Down
2 changes: 1 addition & 1 deletion cc/toolchains/llvm20/aarch64-darwin/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(
"strip": "wrappers/llvm-strip",
},
toolchain_identifier = "clang-aarch64-darwin",
toolchain_path_prefix = "external/aarch64-darwin-llvm20",
toolchain_path_prefix = "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-darwin-llvm20",
use_lld = False,
)

Expand Down
6 changes: 2 additions & 4 deletions cc/toolchains/llvm20/aarch64-linux/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,7 @@ cc_toolchain_config(
abi_version = "clang",
builtin_sysroot = select({
"@rules_swiftnav//cc:_use_libcpp": None,
# When bzlmod is enabled but libcpp is not, use the bzlmod path
"@rules_swiftnav//cc:_enable_bzlmod_not_libcpp": "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-sysroot",
"//conditions:default": "external/aarch64-sysroot",
"//conditions:default": "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-sysroot",
}),
compiler = "clang",
cxx_builtin_include_directories = select({
Expand Down Expand Up @@ -148,7 +146,7 @@ cc_toolchain_config(
"strip": "wrappers/llvm-strip",
},
toolchain_identifier = "clang-aarch64-linux",
toolchain_path_prefix = "external/aarch64-linux-llvm20",
toolchain_path_prefix = "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-linux-llvm20",
)

cc_toolchain(
Expand Down
6 changes: 2 additions & 4 deletions 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,9 +103,7 @@ cc_toolchain_config(
abi_version = "clang",
builtin_sysroot = select({
# _use_libcpp case needs to be implemented properly here!
# When bzlmod is enabled but libcpp is not, use the bzlmod path
"@rules_swiftnav//cc:_enable_bzlmod_not_libcpp": "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-sysroot",
"//conditions:default": "external/aarch64-sysroot",
"//conditions:default": "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-sysroot",
}),
compiler = "clang",
cxx_builtin_include_directories = [
Expand All @@ -129,7 +127,7 @@ cc_toolchain_config(
"strip": "wrappers/llvm-strip",
},
toolchain_identifier = "clang-x86_64-linux",
toolchain_path_prefix = "external/x86_64-linux-llvm20",
toolchain_path_prefix = "external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-linux-llvm20",
)

cc_toolchain(
Expand Down
2 changes: 1 addition & 1 deletion cc/toolchains/llvm20/x86_64-darwin/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ cc_toolchain_config(
"strip": "wrappers/llvm-strip",
},
toolchain_identifier = "clang-x86_64-darwin",
toolchain_path_prefix = "external/x86_64-darwin-llvm20",
toolchain_path_prefix = "external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-darwin-llvm20",
)

cc_toolchain(
Expand Down
6 changes: 2 additions & 4 deletions 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 @@ -117,9 +117,7 @@ cc_toolchain_config(
abi_version = "clang",
builtin_sysroot = select({
"@rules_swiftnav//cc:_use_libcpp": None,
# When bzlmod is enabled but libcpp is not, use the bzlmod path
"@rules_swiftnav//cc:_enable_bzlmod_not_libcpp": "external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-sysroot",
"//conditions:default": "external/x86_64-sysroot",
"//conditions:default": "external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-sysroot",
}),
compiler = "clang",
cxx_builtin_include_directories = select({
Expand Down Expand Up @@ -148,7 +146,7 @@ cc_toolchain_config(
"strip": "wrappers/llvm-strip",
},
toolchain_identifier = "clang-x86_64-linux",
toolchain_path_prefix = "external/x86_64-linux-llvm20",
toolchain_path_prefix = "external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-linux-llvm20",
)

cc_toolchain(
Expand Down
2 changes: 2 additions & 0 deletions examples/small_world/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
common --@rules_swiftnav//cc:enable_bzlmod=true

build:aarch64_darwin_llvm20 --platforms @rules_swiftnav//platforms:aarch64_darwin_llvm20

coverage --experimental_generate_llvm_lcov
coverage --combined_report=lcov

Expand Down
2 changes: 2 additions & 0 deletions examples/small_world/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ local_path_override(
swift_cc_toolchain_ext = use_extension("@rules_swiftnav//cc:extensions.bzl", "swift_cc_toolchain_extension")
use_repo(
swift_cc_toolchain_ext,
"aarch64-darwin-llvm",
"aarch64-darwin-llvm20",
"aarch64-linux-llvm20",
"aarch64-sysroot",
Expand All @@ -19,6 +20,7 @@ use_repo(
)

register_toolchains(
"@rules_swiftnav//cc/toolchains/llvm/aarch64-darwin:cc-toolchain-aarch64-darwin",
"@rules_swiftnav//cc/toolchains/llvm20/aarch64-darwin:cc-toolchain-aarch64-darwin",
"@rules_swiftnav//cc/toolchains/llvm20/x86_64-darwin:cc-toolchain-x86_64-darwin",
"@rules_swiftnav//cc/toolchains/llvm20/aarch64-linux:cc-toolchain-aarch64-linux",
Expand Down
2 changes: 1 addition & 1 deletion examples/small_world/MODULE.bazel.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.