motiejus/hermetic_cc_toolchain
1
Fork 0
Code Releases Activity

specify absolute path to glibchack-fcntl.h

Browse Source
This commit is contained in:
Motiejus Jakštys 2021-08-06 08:44:56 +03:00
parent 7b0c37aacd
commit e262e3acc5
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

@ -110,7 +110,7 @@ def _target_linux_gnu(gocpu, zigcpu, glibc_version = ""):
"libc/include/{}-linux-any".format(zigcpu), "libc/include/{}-linux-any".format(zigcpu),
], ],
toplevel_include = ["glibc-hacks"] if fcntl_hack else [], 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 [], linker_version_scripts = ["glibc-hacks/fcntl.map"] if fcntl_hack else [],
linkopts = ["-lc++", "-lc++abi"], linkopts = ["-lc++", "-lc++abi"],
copts = DEFAULT_COPTS, 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", []): for s in getattr(target_config, "linker_version_scripts", []):
linkopts = linkopts + ["-Wl,--version-script,%s/%s" % (absolute_path, s)] linkopts = linkopts + ["-Wl,--version-script,%s/%s" % (absolute_path, s)]
for incl in getattr(target_config, "compiler_extra_includes", []): for incl in getattr(target_config, "compiler_extra_includes", []):
copts = copts + ["-include", incl] copts = copts + ["-include", absolute_path + "/" + incl]
zig_cc_toolchain_config( zig_cc_toolchain_config(
name = zigtarget + "_cc_toolchain_config", name = zigtarget + "_cc_toolchain_config",