motiejus/hermetic_cc_toolchain
1
Fork 0
Code Releases Activity

add missing include of x86-linux-any

Browse Source 
Was added as part of https://github.com/ziglang/zig/issues/9837
This commit is contained in:
Motiejus Jakštys 2021-12-07 11:53:00 +02:00
parent 4fe2552ab1
commit 780eaff263
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toolchain/defs.bzl
View File

@ -104,7 +104,7 @@ def _target_linux_gnu(gocpu, zigcpu, glibc_version = ""):
"libc/include/any-linux-any", "libc/include/any-linux-any",
"libc/include/{}-linux-gnu".format(zigcpu), "libc/include/{}-linux-gnu".format(zigcpu),
"libc/include/{}-linux-any".format(zigcpu), "libc/include/{}-linux-any".format(zigcpu),
], ] + ["libc/include/x86-linux-any"] if zigcpu == "x86_64" else [],
toplevel_include = ["glibc-hacks"] if fcntl_hack else [], toplevel_include = ["glibc-hacks"] if fcntl_hack else [],
compiler_extra_includes = ["glibc-hacks/glibchack-fcntl.h"] 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 [], linker_version_scripts = ["glibc-hacks/fcntl.map"] if fcntl_hack else [],
@ -127,7 +127,7 @@ def _target_linux_musl(gocpu, zigcpu):
"libc/include/any-linux-any", "libc/include/any-linux-any",
"libc/include/{}-linux-musl".format(zigcpu), "libc/include/{}-linux-musl".format(zigcpu),
"libc/include/{}-linux-any".format(zigcpu), "libc/include/{}-linux-any".format(zigcpu),
], ] + ["libc/include/x86-linux-any"] if zigcpu == "x86_64" else [],
linkopts = ["-s", "-w"], linkopts = ["-s", "-w"],
copts = DEFAULT_COPTS + ["-D_LIBCPP_HAS_MUSL_LIBC", "-D_LIBCPP_HAS_THREAD_API_PTHREAD"], copts = DEFAULT_COPTS + ["-D_LIBCPP_HAS_MUSL_LIBC", "-D_LIBCPP_HAS_THREAD_API_PTHREAD"],
bazel_target_cpu = "k8", bazel_target_cpu = "k8",