motiejus
/
hermetic_cc_toolchain
1
Fork 0
Code Releases Activity

wip musl

This commit is contained in:
Motiejus Jakštys 2021-06-03 20:09:04 +03:00 committed by Motiejus Jakštys
parent d461cf1dcc
commit dae4d81f96
2 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zig-toolchains/BUILD.bazel
View File

@ -0,0 +1,16 @@
constraint_setting(name = "libc")
constraint_value(
name = "glibc_2_28",
constraint_setting = ":libc",
)
constraint_value(
name = "musl",
constraint_setting = ":libc",
)
#constraint_value(
# name = "glibc_2_19",
# constraint_setting = ":libc",
#)

54
zig-toolchains/defs.bzl
View File

@ -2,10 +2,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load(":zig_toolchain.bzl", "zig_cc_toolchain_config") load(":zig_toolchain.bzl", "zig_cc_toolchain_config")
DEFAULT_TOOL_PATHS = { DEFAULT_TOOL_PATHS = {
"ar": "llvm-ar", # TODO this should be "build-lib", see https://github.com/ziglang/zig/issues/7915 "ar": "ar",
"gcc": "c++", # https://github.com/bazelbuild/bazel/issues/4644 "gcc": "c++", # https://github.com/bazelbuild/bazel/issues/4644
# TODO See https://github.com/ziglang/zig/issues/7917 for zig issue to implement these other tools.
"cpp": "/usr/bin/false", "cpp": "/usr/bin/false",
"gcov": "/usr/bin/false", "gcov": "/usr/bin/false",
"nm": "/usr/bin/false", "nm": "/usr/bin/false",
@ -15,9 +14,8 @@ DEFAULT_TOOL_PATHS = {
DEFAULT_INCLUDE_DIRECTORIES = [ DEFAULT_INCLUDE_DIRECTORIES = [
"include", "include",
# "libcxx/include", "libcxx/include",
# "libcxxabi/include", "libcxxabi/include",
# "libunwind/include",
] ]
# https://github.com/ziglang/zig/blob/0cfa39304b18c6a04689bd789f5dc4d035ec43b0/src/main.zig#L2962-L2966 # https://github.com/ziglang/zig/blob/0cfa39304b18c6a04689bd789f5dc4d035ec43b0/src/main.zig#L2962-L2966
@ -25,8 +23,6 @@ TARGET_CONFIGS = [
struct( struct(
target="x86_64-macos-gnu", target="x86_64-macos-gnu",
includes=[ includes=[
"libcxx/include",
"libcxxabi/include",
"libunwind/include", "libunwind/include",
"libc/include/any-macos-any", "libc/include/any-macos-any",
"libc/include/x86_64-macos-any", "libc/include/x86_64-macos-any",
@ -42,28 +38,28 @@ TARGET_CONFIGS = [
# If this gets uncommented, bazel will put `-target <...>gnu`, even if # If this gets uncommented, bazel will put `-target <...>gnu`, even if
# the platform is explicitly set to: # the platform is explicitly set to:
# --platforms=@com_github_ziglang_zig//:x86_64-linux-musl # --platforms=@com_github_ziglang_zig//:x86_64-linux-musl
#struct( struct(
# target="x86_64-linux-gnu.2.28", target="x86_64-linux-gnu.2.28",
# includes=[ includes=[
# "libcxx/include", "libunwind/include",
# "libcxxabi/include", "libc/include/generic-glibc",
# "libunwind/include", "libc/include/any-linux-any",
# "libc/include/generic-glibc", "libc/include/x86_64-linux-gnu",
# "libc/include/any-linux-any", "libc/include/x86_64-linux-any",
# "libc/include/x86_64-linux-gnu", ],
# "libc/include/x86_64-linux-any", linkopts=["-lc++", "-lc++abi"],
# ], copts=[],
# linkopts=["-lc++", "-lc++abi"], bazel_target_cpu="k8",
# copts=[], constraint_values=[
# bazel_target_cpu="k8", "@platforms//os:linux",
# constraint_values=["@platforms//os:linux", "@platforms//cpu:x86_64"], "@platforms//cpu:x86_64",
# tool_paths={"ld": "ld.lld"}, #"//zig-toolchains:glibc_2_28",
#), ],
tool_paths={"ld": "ld.lld"},
),
struct( struct(
target="x86_64-linux-musl", target="x86_64-linux-musl",
includes=[ includes=[
"libcxx/include",
"libcxxabi/include",
"libc/include/generic-musl", "libc/include/generic-musl",
"libc/include/any-linux-any", "libc/include/any-linux-any",
"libc/include/x86_64-linux-musl", "libc/include/x86_64-linux-musl",
@ -72,7 +68,11 @@ TARGET_CONFIGS = [
linkopts=[], linkopts=[],
copts=["-D_LIBCPP_HAS_MUSL_LIBC", "-D_LIBCPP_HAS_THREAD_API_PTHREAD"], copts=["-D_LIBCPP_HAS_MUSL_LIBC", "-D_LIBCPP_HAS_THREAD_API_PTHREAD"],
bazel_target_cpu="k8", bazel_target_cpu="k8",
constraint_values=["@platforms//os:linux", "@platforms//cpu:x86_64"], constraint_values=[
"@platforms//os:linux",
"@platforms//cpu:x86_64",
#"//zig-toolchains:musl",
],
tool_paths={"ld": "ld.lld"}, tool_paths={"ld": "ld.lld"},
), ),
] ]