From 230da38f54a5c49ac0fa2b1834063a41dec7725c Mon Sep 17 00:00:00 2001 From: Piotr Sikora Date: Sun, 16 Jan 2022 15:55:41 -0800 Subject: [PATCH] Fix include paths when targeting non-x86_64 archs. Signed-off-by: Piotr Sikora --- toolchain/defs.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain/defs.bzl b/toolchain/defs.bzl index 3856490..b55945c 100644 --- a/toolchain/defs.bzl +++ b/toolchain/defs.bzl @@ -103,7 +103,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 [], + ] + (["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 [], @@ -126,7 +126,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 [], + ] + (["libc/include/x86-linux-any"] if zigcpu == "x86_64" else []), linkopts = ["-s", "-w"], copts = ["-D_LIBCPP_HAS_MUSL_LIBC", "-D_LIBCPP_HAS_THREAD_API_PTHREAD"], bazel_target_cpu = "k8",