From e262e3acc5ecdfd79df5c85c8ccdf9544b9b5af5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Fri, 6 Aug 2021 08:44:56 +0300 Subject: [PATCH] specify absolute path to glibchack-fcntl.h --- toolchain/defs.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain/defs.bzl b/toolchain/defs.bzl index 5a2b71e..e0b8dce 100644 --- a/toolchain/defs.bzl +++ b/toolchain/defs.bzl @@ -110,7 +110,7 @@ def _target_linux_gnu(gocpu, zigcpu, glibc_version = ""): "libc/include/{}-linux-any".format(zigcpu), ], toplevel_include = ["glibc-hacks"] if fcntl_hack else [], - compiler_extra_includes = ["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 [], linkopts = ["-lc++", "-lc++abi"], copts = DEFAULT_COPTS, @@ -322,7 +322,7 @@ def zig_build_macro(absolute_path, zig_include_root): for s in getattr(target_config, "linker_version_scripts", []): linkopts = linkopts + ["-Wl,--version-script,%s/%s" % (absolute_path, s)] for incl in getattr(target_config, "compiler_extra_includes", []): - copts = copts + ["-include", incl] + copts = copts + ["-include", absolute_path + "/" + incl] zig_cc_toolchain_config( name = zigtarget + "_cc_toolchain_config",