Skip to content

Commit 25b208c

Browse files
committed
Migrate x86_64-aarch64-linux toolchain
1 parent 049eaca commit 25b208c

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

cc/toolchains/llvm/x86_64-aarch64-linux/BUILD.bazel

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,12 @@ cc_toolchain_config(
101101
name = "local-x86_64-aarch64-linux",
102102
abi_libc_version = "glibc_unknown",
103103
abi_version = "clang",
104-
builtin_sysroot = "external/aarch64-sysroot",
104+
builtin_sysroot = select({
105+
"@rules_swiftnav//cc:_use_libcpp": None,
106+
# Remove once bzlmod is enabled by default
107+
"@rules_swiftnav//cc:_enable_bzlmod": "external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-sysroot",
108+
"//conditions:default": "external/aarch64-sysroot",
109+
}),
105110
compiler = "clang",
106111
cxx_builtin_include_directories = [
107112
"%sysroot%/usr/include",

cc/toolchains/llvm/x86_64-aarch64-linux/wrappers/wrapper

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ fi
3535

3636
tool_name=$(basename "${BASH_SOURCE[0]}")
3737
toolchain_bindir=external/x86_64-linux-llvm/bin
38+
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-linux-llvm/bin"
3839

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

0 commit comments

Comments
 (0)