motiejus
/
hermetic_cc_toolchain
1
Fork 0
Code Releases Activity

Removed leftovers of `compiler_extra_includes`

This commit is contained in:
Goni Zahavy 2023-04-13 11:04:59 +00:00 committed by Motiejus Jakštys
parent 19c735c41a
commit f164afe89a
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
toolchain/defs.bzl
View File

@ -250,7 +250,6 @@ def declare_files(os):
for target_config in target_structs(): for target_config in target_structs():
all_includes = [native.glob(["lib/{}/**".format(i)]) for i in target_config.includes] all_includes = [native.glob(["lib/{}/**".format(i)]) for i in target_config.includes]
all_includes.append(getattr(target_config, "compiler_extra_includes", []))
cxx_tool_label = ":" + zig_tool_path(os).format( cxx_tool_label = ":" + zig_tool_path(os).format(
zig_tool = "c++", zig_tool = "c++",

2
toolchain/private/cc_toolchains.bzl
View File

@ -33,8 +33,6 @@ def declare_cc_toolchains(os, zig_sdk_path):
linkopts = [] linkopts = []
for s in getattr(target_config, "linker_version_scripts", []): for s in getattr(target_config, "linker_version_scripts", []):
linkopts = ["-Wl,--version-script,%s/%s" % (zig_sdk_path, s)] linkopts = ["-Wl,--version-script,%s/%s" % (zig_sdk_path, s)]
for incl in getattr(target_config, "compiler_extra_includes", []):
copts = copts + ["-include", zig_sdk_path + "/" + incl]
# We can't pass a list of structs to a rule, so we use json encoding. # We can't pass a list of structs to a rule, so we use json encoding.
artifact_name_patterns = getattr(target_config, "artifact_name_patterns", []) artifact_name_patterns = getattr(target_config, "artifact_name_patterns", [])