From 780eaff2634a165d2dcb6a72175042fd76ddde9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Tue, 7 Dec 2021 11:53:00 +0200 Subject: [PATCH] add missing include of x86-linux-any Was added as part of https://github.com/ziglang/zig/issues/9837 --- toolchain/defs.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain/defs.bzl b/toolchain/defs.bzl index faf2a63..0986a14 100644 --- a/toolchain/defs.bzl +++ b/toolchain/defs.bzl @@ -104,7 +104,7 @@ def _target_linux_gnu(gocpu, zigcpu, glibc_version = ""): "libc/include/any-linux-any", "libc/include/{}-linux-gnu".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 [], compiler_extra_includes = ["glibc-hacks/glibchack-fcntl.h"] 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/{}-linux-musl".format(zigcpu), "libc/include/{}-linux-any".format(zigcpu), - ], + ] + ["libc/include/x86-linux-any"] if zigcpu == "x86_64" else [], linkopts = ["-s", "-w"], copts = DEFAULT_COPTS + ["-D_LIBCPP_HAS_MUSL_LIBC", "-D_LIBCPP_HAS_THREAD_API_PTHREAD"], bazel_target_cpu = "k8",