0302fb630a
Empirically these need to come from most specfic to least specific.
The error message is as follows:
In file included from test/c/main.c:1:
In file included from external/zig_sdk/lib/libcxx/include/stdio.h:107:
In file included from external/zig_sdk/lib/libc/include/generic-glibc/stdio.h:38:
external/zig_sdk/lib/libc/include/generic-glibc/bits/types.h:139:3: error:
# error
^
external/zig_sdk/lib/libc/include/generic-glibc/bits/types.h:145:1: error: unknown type name '__STD_TYPE'
__STD_TYPE __DEV_T_TYPE __dev_t; /* Type of device numbers. */
Dissected `generic-glibc/bits/types.h:#error`:
#if __WORDSIZE == 32
<...>
# define __STD_TYPE __extension__ typedef
#elif __WORDSIZE == 64
<...>
# define __STD_TYPE typedef
#else
# error
#endif
So we do not have the `__WORDSIZE`. Where does that come from? Probably from a
directory that has an `x86_64` in it. How does that get included? Let's start
with `lib/libcxx/include/stdio.h`:
16 #include_next <stdio.h>
Now previously our `c++` command line looked like this:
external/zig_sdk/tools/c++ \
<...>
-Iexternal/zig_sdk/lib/include \
-Iexternal/zig_sdk/lib/libcxx/include \
-Iexternal/zig_sdk/lib/libcxxabi/include \
-Iexternal/zig_sdk/lib/libunwind/include \
-Iexternal/zig_sdk/lib/libc/include/generic-glibc \
-Iexternal/zig_sdk/lib/libc/include/any-linux-any \
-Iexternal/zig_sdk/lib/libc/include/x86_64-linux-gnu \
-Iexternal/zig_sdk/lib/libc/include/x86_64-linux-any \
-Iexternal/zig_sdk/lib/libc/include/x86-linux-any \
-Iexternal/zig_sdk/glibc-hacks \
<...>
So the next place it will find `stdio.h` is in `generic-glibc`, which already
uses the `__WORDSIZE`. If we make the "next" include to be the arch-specific
one instead of the generic-glibc, things start compiling again.
Fix the same fo musl.
145 lines
4.8 KiB
Python
145 lines
4.8 KiB
Python
_ZIG_TOOL_PATH = "tools/{zig_tool}"
|
|
|
|
# Zig supports even older glibcs than defined below, but we have tested only
|
|
# down to 2.17.
|
|
# $ zig targets | jq -r '.glibc[]' | sort -V
|
|
_GLIBCS = [
|
|
"2.17",
|
|
"2.18",
|
|
"2.19",
|
|
"2.22",
|
|
"2.23",
|
|
"2.24",
|
|
"2.25",
|
|
"2.26",
|
|
"2.27",
|
|
"2.28",
|
|
"2.29",
|
|
"2.30",
|
|
"2.31",
|
|
"2.32",
|
|
"2.33",
|
|
"2.34",
|
|
]
|
|
|
|
LIBCS = ["musl"] + ["gnu.{}".format(glibc) for glibc in _GLIBCS]
|
|
|
|
def zig_tool_path(os):
|
|
if os == "windows":
|
|
return _ZIG_TOOL_PATH + ".bat"
|
|
else:
|
|
return _ZIG_TOOL_PATH
|
|
|
|
def target_structs():
|
|
ret = []
|
|
for zigcpu, gocpu in (("x86_64", "amd64"), ("aarch64", "arm64")):
|
|
ret.append(_target_darwin(gocpu, zigcpu))
|
|
ret.append(_target_windows(gocpu, zigcpu))
|
|
ret.append(_target_linux_musl(gocpu, zigcpu))
|
|
for glibc in _GLIBCS:
|
|
ret.append(_target_linux_gnu(gocpu, zigcpu, glibc))
|
|
return ret
|
|
|
|
def _target_darwin(gocpu, zigcpu):
|
|
min_os = "10"
|
|
if zigcpu == "aarch64":
|
|
min_os = "11"
|
|
return struct(
|
|
gotarget = "darwin_{}".format(gocpu),
|
|
zigtarget = "{}-macos-none".format(zigcpu),
|
|
includes = [
|
|
"libunwind/include",
|
|
# TODO: Define a toolchain for each minimum OS version
|
|
"libc/include/{}-macos.{}-none".format(zigcpu, min_os),
|
|
"libc/include/any-macos.{}-any".format(min_os),
|
|
"libc/include/any-macos-any",
|
|
],
|
|
linkopts = [],
|
|
dynamic_library_linkopts = ["-Wl,-undefined=dynamic_lookup"],
|
|
copts = [],
|
|
bazel_target_cpu = "darwin",
|
|
constraint_values = [
|
|
"@platforms//os:macos",
|
|
"@platforms//cpu:{}".format(zigcpu),
|
|
],
|
|
tool_paths = {"ld": "ld64.lld"},
|
|
)
|
|
|
|
def _target_windows(gocpu, zigcpu):
|
|
return struct(
|
|
gotarget = "windows_{}".format(gocpu),
|
|
zigtarget = "{}-windows-gnu".format(zigcpu),
|
|
includes = [
|
|
"libunwind/include",
|
|
"libc/include/any-windows-any",
|
|
],
|
|
linkopts = [],
|
|
dynamic_library_linkopts = [],
|
|
copts = [],
|
|
bazel_target_cpu = "x64_windows",
|
|
constraint_values = [
|
|
"@platforms//os:windows",
|
|
"@platforms//cpu:{}".format(zigcpu),
|
|
],
|
|
tool_paths = {"ld": "ld64.lld"},
|
|
)
|
|
|
|
def _target_linux_gnu(gocpu, zigcpu, glibc_version):
|
|
glibc_suffix = "gnu.{}".format(glibc_version)
|
|
|
|
# https://github.com/ziglang/zig/issues/5882#issuecomment-888250676
|
|
# fcntl_hack is only required for glibc 2.27 or less.
|
|
fcntl_hack = glibc_version < "2.28"
|
|
|
|
return struct(
|
|
gotarget = "linux_{}_{}".format(gocpu, glibc_suffix),
|
|
zigtarget = "{}-linux-{}".format(zigcpu, glibc_suffix),
|
|
includes = [
|
|
"libc/include/{}-linux-gnu".format(zigcpu),
|
|
"libc/include/generic-glibc",
|
|
] +
|
|
# x86_64-linux-any is x86_64-linux and x86-linux combined.
|
|
(["libc/include/x86-linux-any"] if zigcpu == "x86_64" else []) +
|
|
(["libc/include/{}-linux-any".format(zigcpu)] if zigcpu != "x86_64" else []) + [
|
|
"libc/include/any-linux-any",
|
|
],
|
|
toplevel_include = ["glibc-hacks"] if fcntl_hack else [],
|
|
compiler_extra_includes = ["glibc-hacks/glibchack-fcntl.h"] if fcntl_hack else [],
|
|
linker_version_scripts = ["glibc-hacks/fcntl.map"] if fcntl_hack else [],
|
|
linkopts = ["-lc++", "-lc++abi"],
|
|
dynamic_library_linkopts = [],
|
|
copts = [],
|
|
bazel_target_cpu = "k8",
|
|
constraint_values = [
|
|
"@platforms//os:linux",
|
|
"@platforms//cpu:{}".format(zigcpu),
|
|
],
|
|
libc_constraint = "@zig_sdk//libc:{}".format(glibc_suffix),
|
|
tool_paths = {"ld": "ld.lld"},
|
|
)
|
|
|
|
def _target_linux_musl(gocpu, zigcpu):
|
|
return struct(
|
|
gotarget = "linux_{}_musl".format(gocpu),
|
|
zigtarget = "{}-linux-musl".format(zigcpu),
|
|
includes = [
|
|
"libc/include/{}-linux-musl".format(zigcpu),
|
|
"libc/include/generic-musl",
|
|
] +
|
|
# x86_64-linux-any is x86_64-linux and x86-linux combined.
|
|
(["libc/include/x86-linux-any"] if zigcpu == "x86_64" else []) +
|
|
(["libc/include/{}-linux-any".format(zigcpu)] if zigcpu != "x86_64" else []) + [
|
|
"libc/include/any-linux-any",
|
|
],
|
|
linkopts = [],
|
|
dynamic_library_linkopts = [],
|
|
copts = ["-D_LIBCPP_HAS_MUSL_LIBC", "-D_LIBCPP_HAS_THREAD_API_PTHREAD"],
|
|
bazel_target_cpu = "k8",
|
|
constraint_values = [
|
|
"@platforms//os:linux",
|
|
"@platforms//cpu:{}".format(zigcpu),
|
|
],
|
|
libc_constraint = "@zig_sdk//libc:musl",
|
|
tool_paths = {"ld": "ld.lld"},
|
|
)
|