Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added param_file_features.patch
Binary file not shown.
2 changes: 1 addition & 1 deletion toolchain/defs.bzl
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "read_user_netrc", "use_netrc")
load("@hermetic_cc_toolchain//toolchain:utils.bzl", "quote")
load("@hermetic_cc_toolchain//toolchain/private:defs.bzl", "target_structs", "transform_os_name", "zig_tool_path")
load("@hermetic_cc_toolchain//toolchain/private:repositories.bzl", "zig_sdk_repository")
load("@hermetic_cc_toolchain//toolchain:utils.bzl", "quote")
load(
"@hermetic_cc_toolchain//toolchain/private:zig_sdk.bzl",
"HOST_PLATFORM_SHA256",
Expand Down
2 changes: 1 addition & 1 deletion toolchain/private/cc_toolchains.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ def declare_cc_toolchains(os, zig_sdk_path):
dwp_files = "//:empty",
objcopy_files = "//:empty",
strip_files = "//:empty",
supports_param_files = 0,
supports_param_files = True,
visibility = ["//visibility:private"],
)
2 changes: 1 addition & 1 deletion toolchain/private/repositories.bzl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@hermetic_cc_toolchain//toolchain/private:defs.bzl", "transform_arch_name", "transform_os_name")
load("@hermetic_cc_toolchain//toolchain:utils.bzl", "quote")
load("@hermetic_cc_toolchain//toolchain/private:defs.bzl", "transform_arch_name", "transform_os_name")

def _define_zig_toolchains(repository_ctx, configs, package = ""):
extra_target_settings = "[" + " ".join([quote(str(setting)) + "," for setting in repository_ctx.attr.extra_target_settings]) + "]"
Expand Down
27 changes: 27 additions & 0 deletions toolchain/zig_cc_toolchain.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,38 @@ def _zig_cc_toolchain_config_impl(ctx):
],
)

linker_param_file_feature = feature(
name = "linker_param_file",
flag_sets = [
flag_set(
actions = all_link_actions +
[ACTION_NAMES.cpp_link_static_library],
flag_groups = [
flag_group(
flags = ["@%{linker_param_file}"],
expand_if_available = "linker_param_file",
),
],
),
],
)

archive_param_file_feature = feature(
name = "archive_param_file",
)

compiler_param_file_feature = feature(
name = "compiler_param_file",
)

features = [
compile_and_link_flags,
default_linker_flags,
supports_dynamic_linker,
strip_debug_symbols_feature,
linker_param_file_feature,
archive_param_file_feature,
compiler_param_file_feature,
] + _compilation_mode_features(ctx)

artifact_name_patterns = [
Expand Down