add aarch64
This commit is contained in:
Motiejus Jakštys
parent
4e48d6f1af
commit
31316fd30c
|
|
@ -3,7 +3,8 @@ load(":zig_toolchain.bzl", "zig_cc_toolchain_config")
|
|||
|
||||
DEFAULT_TOOL_PATHS = {
|
||||
"ar": "ar",
|
||||
"gcc": "c++", # https://github.com/bazelbuild/bazel/issues/4644
|
||||
"gcc": "c++", # https://github.com/bazelbuild/bazel/issues/4644
|
||||
|
||||
"cpp": "/usr/bin/false",
|
||||
"gcov": "/usr/bin/false",
|
||||
"nm": "/usr/bin/false",
|
||||
|
|
@ -18,78 +19,81 @@ DEFAULT_INCLUDE_DIRECTORIES = [
|
|||
]
|
||||
|
||||
# https://github.com/ziglang/zig/blob/0cfa39304b18c6a04689bd789f5dc4d035ec43b0/src/main.zig#L2962-L2966
|
||||
TARGET_CONFIGS = [
|
||||
TARGET_CONFIGS_LISTOFLISTS = [[
|
||||
struct(
|
||||
target = "x86_64-macos-gnu",
|
||||
includes = [
|
||||
target="{}-macos-gnu".format(cpu),
|
||||
includes=[
|
||||
"libunwind/include",
|
||||
"libc/include/any-macos-any",
|
||||
"libc/include/x86_64-macos-any",
|
||||
"libc/include/x86_64-macos-gnu",
|
||||
"libc/include/{}-macos-any".format(cpu),
|
||||
"libc/include/{}-macos-gnu".format(cpu),
|
||||
],
|
||||
# linkopts=["-lc++", "-lc++abi"],
|
||||
linkopts = [],
|
||||
copts = [],
|
||||
bazel_target_cpu = "darwin",
|
||||
constraint_values = [
|
||||
linkopts=[],
|
||||
copts=[],
|
||||
bazel_target_cpu="darwin",
|
||||
constraint_values=[
|
||||
"@platforms//os:macos",
|
||||
"@platforms//cpu:x86_64",
|
||||
"@platforms//cpu:{}".format(cpu),
|
||||
],
|
||||
tool_paths = {"ld": "ld64.lld"},
|
||||
tool_paths={"ld": "ld64.lld"},
|
||||
),
|
||||
] + [
|
||||
struct(
|
||||
target = "x86_64-linux-gnu",
|
||||
target="{}-linux-gnu".format(cpu),
|
||||
target_suffix = ".2.19",
|
||||
includes = [
|
||||
includes=[
|
||||
"libunwind/include",
|
||||
"libc/include/generic-glibc",
|
||||
"libc/include/any-linux-any",
|
||||
"libc/include/x86_64-linux-gnu",
|
||||
"libc/include/x86_64-linux-any",
|
||||
"libc/include/{}-linux-gnu".format(cpu),
|
||||
"libc/include/{}-linux-any".format(cpu),
|
||||
],
|
||||
linkopts = ["-lc++", "-lc++abi"],
|
||||
copts = [],
|
||||
bazel_target_cpu = "k8",
|
||||
constraint_values = [
|
||||
linkopts=["-lc++", "-lc++abi"],
|
||||
copts=[],
|
||||
bazel_target_cpu="k8",
|
||||
constraint_values=[
|
||||
"@platforms//os:linux",
|
||||
"@platforms//cpu:x86_64",
|
||||
"@platforms//cpu:{}".format(cpu),
|
||||
],
|
||||
tool_paths = {"ld": "ld.lld"},
|
||||
tool_paths={"ld": "ld.lld"},
|
||||
),
|
||||
struct(
|
||||
target = "x86_64-linux-musl",
|
||||
includes = [
|
||||
target="{}-linux-musl".format(cpu),
|
||||
includes=[
|
||||
"libc/include/generic-musl",
|
||||
"libc/include/any-linux-any",
|
||||
"libc/include/x86_64-linux-musl",
|
||||
"libc/include/x86_64-linux-any",
|
||||
"libc/include/{}-linux-musl".format(cpu),
|
||||
"libc/include/{}-linux-any".format(cpu),
|
||||
],
|
||||
linkopts = [],
|
||||
copts = ["-D_LIBCPP_HAS_MUSL_LIBC", "-D_LIBCPP_HAS_THREAD_API_PTHREAD"],
|
||||
bazel_target_cpu = "k8",
|
||||
constraint_values = [
|
||||
linkopts=[],
|
||||
copts=["-D_LIBCPP_HAS_MUSL_LIBC", "-D_LIBCPP_HAS_THREAD_API_PTHREAD"],
|
||||
bazel_target_cpu="k8",
|
||||
constraint_values=[
|
||||
"@platforms//os:linux",
|
||||
"@platforms//cpu:x86_64",
|
||||
"@platforms//cpu:{}".format(cpu),
|
||||
":musl",
|
||||
],
|
||||
tool_paths = {"ld": "ld.lld"},
|
||||
tool_paths={"ld": "ld.lld"},
|
||||
),
|
||||
]
|
||||
] for cpu in ("x86_64", "aarch64")]
|
||||
|
||||
TARGET_CONFIGS = [val for sublist in TARGET_CONFIGS_LISTOFLISTS for val in sublist]
|
||||
|
||||
def toolchain_repositories():
|
||||
zig_repository(
|
||||
name = "zig_sdk",
|
||||
|
||||
version = "0.8.0",
|
||||
url_format = "https://ziglang.org/download/{version}/zig-{host_platform}-{version}.tar.xz",
|
||||
host_platform_sha256 = {
|
||||
"linux-x86_64": "502625d3da3ae595c5f44a809a87714320b7a40e6dff4a895b5fa7df3391d01e",
|
||||
"macos-x86_64": "279f9360b5cb23103f0395dc4d3d0d30626e699b1b4be55e98fd985b62bc6fbe",
|
||||
},
|
||||
|
||||
host_platform_include_root = {
|
||||
"macos-x86_64": "lib/zig/",
|
||||
"linux-x86_64": "lib/",
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
def register_all_toolchains():
|
||||
|
|
@ -119,10 +123,10 @@ ZIG_TOOLS = [
|
|||
"ar",
|
||||
# List of ld tools: https://github.com/ziglang/zig/blob/0cfa39304b18c6a04689bd789f5dc4d035ec43b0/src/main.zig#L2962-L2966
|
||||
# and also: https://github.com/ziglang/zig/issues/3257
|
||||
"ld.lld", # ELF
|
||||
"ld64.lld", # Mach-O
|
||||
"lld-link", # COFF
|
||||
"wasm-ld", # WebAssembly
|
||||
"ld.lld", # ELF
|
||||
"ld64.lld", # Mach-O
|
||||
"lld-link", # COFF
|
||||
"wasm-ld", # WebAssembly
|
||||
]
|
||||
|
||||
def _zig_repository_impl(repository_ctx):
|
||||
|
|
@ -134,8 +138,8 @@ def _zig_repository_impl(repository_ctx):
|
|||
zig_include_root = repository_ctx.attr.host_platform_include_root[host_platform]
|
||||
zig_sha256 = repository_ctx.attr.host_platform_sha256[host_platform]
|
||||
format_vars = {
|
||||
"version": repository_ctx.attr.version,
|
||||
"host_platform": host_platform,
|
||||
"version" : repository_ctx.attr.version,
|
||||
"host_platform" : host_platform,
|
||||
}
|
||||
zig_url = repository_ctx.attr.url_format.format(**format_vars)
|
||||
|
||||
|
|
@ -147,8 +151,8 @@ def _zig_repository_impl(repository_ctx):
|
|||
|
||||
for zig_tool in ZIG_TOOLS:
|
||||
repository_ctx.file(
|
||||
ZIG_TOOL_PATH.format(zig_tool = zig_tool),
|
||||
ZIG_TOOL_WRAPPER.format(zig = str(repository_ctx.path("zig")), zig_tool = zig_tool),
|
||||
ZIG_TOOL_PATH.format(zig_tool=zig_tool),
|
||||
ZIG_TOOL_WRAPPER.format(zig=str(repository_ctx.path("zig")), zig_tool=zig_tool),
|
||||
)
|
||||
|
||||
absolute_path = json.encode(str(repository_ctx.path("")))
|
||||
|
|
@ -177,9 +181,9 @@ def filegroup(name, **kwargs):
|
|||
return ":" + name
|
||||
|
||||
def zig_build_macro(absolute_path, zig_include_root):
|
||||
filegroup(name = "empty")
|
||||
filegroup(name = "zig_compiler", srcs = ["zig"])
|
||||
filegroup(name = "lib/std", srcs = native.glob(["lib/std/**"]))
|
||||
filegroup(name="empty")
|
||||
filegroup(name="zig_compiler", srcs=["zig"])
|
||||
filegroup(name="lib/std", srcs=native.glob(["lib/std/**"]))
|
||||
|
||||
native.constraint_setting(name = "libc")
|
||||
|
||||
|
|
@ -207,7 +211,7 @@ def zig_build_macro(absolute_path, zig_include_root):
|
|||
for d in DEFAULT_INCLUDE_DIRECTORIES + target_config.includes:
|
||||
d = zig_include_root + d
|
||||
if d not in lazy_filegroups:
|
||||
lazy_filegroups[d] = filegroup(name = d, srcs = native.glob([d + "/**"]))
|
||||
lazy_filegroups[d] = filegroup(name=d, srcs=native.glob([d + "/**"]))
|
||||
compiler_srcs.append(lazy_filegroups[d])
|
||||
cxx_builtin_include_directories.append(absolute_path + "/" + d)
|
||||
|
||||
|
|
@ -216,19 +220,19 @@ def zig_build_macro(absolute_path, zig_include_root):
|
|||
if path[0] == "/":
|
||||
absolute_tool_paths[name] = path
|
||||
continue
|
||||
tool_path = ZIG_TOOL_PATH.format(zig_tool = path)
|
||||
tool_path = ZIG_TOOL_PATH.format(zig_tool=path)
|
||||
absolute_tool_paths[name] = "%s/%s" % (absolute_path, tool_path)
|
||||
tool_srcs[name].append(tool_path)
|
||||
|
||||
ar_files = filegroup(name = target + "_ar_files", srcs = ar_srcs)
|
||||
linker_files = filegroup(name = target + "_linker_files", srcs = linker_srcs)
|
||||
compiler_files = filegroup(name = target + "_compiler_files", srcs = compiler_srcs)
|
||||
all_files = filegroup(name = target + "_all_files", srcs = all_srcs + [ar_files, linker_files, compiler_files])
|
||||
ar_files = filegroup(name=target + "_ar_files", srcs=ar_srcs)
|
||||
linker_files = filegroup(name=target + "_linker_files", srcs=linker_srcs)
|
||||
compiler_files = filegroup(name=target + "_compiler_files", srcs=compiler_srcs)
|
||||
all_files = filegroup(name=target + "_all_files", srcs=all_srcs + [ar_files, linker_files, compiler_files])
|
||||
|
||||
zig_cc_toolchain_config(
|
||||
name = target + "_cc_toolchain_config",
|
||||
target = target,
|
||||
target_suffix = getattr(target_config, "target_suffix", ""),
|
||||
target_suffix = getattr(target_config, 'target_suffix', ''),
|
||||
tool_paths = absolute_tool_paths,
|
||||
cxx_builtin_include_directories = cxx_builtin_include_directories,
|
||||
copts = target_config.copts,
|
||||
|
|
@ -260,7 +264,7 @@ def zig_build_macro(absolute_path, zig_include_root):
|
|||
toolchains = {
|
||||
target_config.bazel_target_cpu: ":%s_cc_toolchain" % target,
|
||||
},
|
||||
tags = ["manual"],
|
||||
tags = ["manual"]
|
||||
)
|
||||
|
||||
native.toolchain(
|
||||
|
|
|
|||
Loading…
Reference in New Issue