motiejus/hermetic_cc_toolchain
1
Fork 0
Code Releases Activity

zig build: add -target automatically

Browse Source
This commit is contained in:
Motiejus Jakštys 2022-11-17 14:04:25 +02:00
parent d195402030
commit 87fb993408
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
toolchain/defs.bzl
View File

@ -184,12 +184,17 @@ eval set -- "$saved"
""" """
def _zig_tool_wrapper(zig_tool, zig, is_windows, cache_prefix, zigtarget, zig_include_root): def _zig_tool_wrapper(zig_tool, zig, is_windows, cache_prefix, zigtarget, zig_include_root):
if zig_tool in ["c++", "build-exe", "build-lib", "build-obj"]:
maybe_target = "-target {}".format(zigtarget)
else:
maybe_target = ""
kwargs = dict( kwargs = dict(
zig = str(zig).replace("/", "\\") + ".exe" if is_windows else zig, zig = str(zig).replace("/", "\\") + ".exe" if is_windows else zig,
zig_tool = zig_tool, zig_tool = zig_tool,
cache_prefix = cache_prefix, cache_prefix = cache_prefix,
maybe_gohack = _ZIG_TOOL_GOHACK if (zig_tool == "c++" and not is_windows) else "", maybe_gohack = _ZIG_TOOL_GOHACK if (zig_tool == "c++" and not is_windows) else "",
maybe_target = "-target {}".format(zigtarget) if zig_tool == "c++" else "", maybe_target = maybe_target,
zig_include_root = zig_include_root.replace("/", "\\") if is_windows else zig_include_root, zig_include_root = zig_include_root.replace("/", "\\") if is_windows else zig_include_root,
) )