Skip to content

Migrate x86 64 aarch64 linux toolchain #174

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 15, 2025
Merged

Migrate x86 64 aarch64 linux toolchain #174

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
25b208c
Migrate x86_64-aarch64-linux toolchain
martin4861 Aug 13, 2025
6130135
Implement proper handling for use_libcpp with bzlmod enabled
martin4861 Aug 13, 2025
9cc0f5e
Bump MODULE version
martin4861 Aug 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
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.3.0",
version = "0.4.0",
compatibility_level = 1,
)

Expand Down
4 changes: 2 additions & 2 deletions 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: 9 additions & 0 deletions cc/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,15 @@ 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
4 changes: 2 additions & 2 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,8 +117,8 @@ cc_toolchain_config(
abi_version = "clang",
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+aarch64-sysroot",
# 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",
}),
compiler = "clang",
Expand Down
7 changes: 6 additions & 1 deletion 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 @@ -101,7 +101,12 @@ cc_toolchain_config(
name = "local-x86_64-aarch64-linux",
abi_libc_version = "glibc_unknown",
abi_version = "clang",
builtin_sysroot = "external/aarch64-sysroot",
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",
}),
compiler = "clang",
cxx_builtin_include_directories = [
"%sysroot%/usr/include",
Expand Down
1 change: 1 addition & 0 deletions cc/toolchains/llvm/x86_64-aarch64-linux/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ fi

tool_name=$(basename "${BASH_SOURCE[0]}")
toolchain_bindir=external/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
4 changes: 2 additions & 2 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,8 +117,8 @@ cc_toolchain_config(
abi_version = "clang",
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",
# 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",
}),
compiler = "clang",
Expand Down
4 changes: 2 additions & 2 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,8 +117,8 @@ cc_toolchain_config(
abi_version = "clang",
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+aarch64-sysroot",
# 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",
}),
compiler = "clang",
Expand Down
5 changes: 3 additions & 2 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 @@ -102,8 +102,9 @@ cc_toolchain_config(
abi_libc_version = "glibc_unknown",
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",
# _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",
}),
compiler = "clang",
Expand Down
4 changes: 2 additions & 2 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,8 +117,8 @@ cc_toolchain_config(
abi_version = "clang",
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",
# 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",
}),
compiler = "clang",
Expand Down
Loading