diff --git a/cc/private/toolchain/unix_cc_toolchain_config.bzl b/cc/private/toolchain/unix_cc_toolchain_config.bzl index 5bc205e3d..15156dfb8 100644 --- a/cc/private/toolchain/unix_cc_toolchain_config.bzl +++ b/cc/private/toolchain/unix_cc_toolchain_config.bzl @@ -1347,22 +1347,6 @@ def _impl(ctx): ], ) - linkstamps_feature = feature( - name = "linkstamps", - flag_sets = [ - flag_set( - actions = all_link_actions + lto_index_actions, - flag_groups = [ - flag_group( - flags = ["%{linkstamp_paths}"], - iterate_over = "linkstamp_paths", - expand_if_available = "linkstamp_paths", - ), - ], - ), - ], - ) - libtool_feature = feature( name = "libtool", enabled = not is_linux, @@ -1855,7 +1839,6 @@ def _impl(ctx): dynamic_library_linker_tool_feature, generate_linkmap_feature, shared_flag_feature, - linkstamps_feature, output_execpath_flags_feature, runtime_library_search_directories_feature, library_search_directories_feature, diff --git a/cc/private/toolchain/windows_cc_toolchain_config.bzl b/cc/private/toolchain/windows_cc_toolchain_config.bzl index 125905ee1..6bf1b7ba6 100644 --- a/cc/private/toolchain/windows_cc_toolchain_config.bzl +++ b/cc/private/toolchain/windows_cc_toolchain_config.bzl @@ -151,7 +151,6 @@ def _impl(ctx): implies = [ "nologo", "shared_flag", - "linkstamps", "output_execpath_flags", "input_param_flags", "user_link_flags", @@ -246,7 +245,6 @@ def _impl(ctx): action_name = ACTION_NAMES.cpp_link_executable, implies = [ "nologo", - "linkstamps", "output_execpath_flags", "input_param_flags", "user_link_flags", @@ -263,7 +261,6 @@ def _impl(ctx): implies = [ "nologo", "shared_flag", - "linkstamps", "output_execpath_flags", "input_param_flags", "user_link_flags", @@ -1080,22 +1077,6 @@ def _impl(ctx): ], ) - linkstamps_feature = feature( - name = "linkstamps", - flag_sets = [ - flag_set( - actions = all_link_actions, - flag_groups = [ - flag_group( - flags = ["%{linkstamp_paths}"], - iterate_over = "linkstamp_paths", - expand_if_available = "linkstamp_paths", - ), - ], - ), - ], - ) - targets_windows_feature = feature( name = "targets_windows", enabled = True, @@ -1345,7 +1326,6 @@ def _impl(ctx): generate_pdb_file_feature, generate_linkmap_feature, shared_flag_feature, - linkstamps_feature, output_execpath_flags_feature, archiver_flags_feature, input_param_flags_feature, diff --git a/cc/private/toolchain_config/legacy_features.bzl b/cc/private/toolchain_config/legacy_features.bzl index c68e82774..f3a076c5b 100644 --- a/cc/private/toolchain_config/legacy_features.bzl +++ b/cc/private/toolchain_config/legacy_features.bzl @@ -464,26 +464,6 @@ def get_legacy_features(ctx, platform, existing_feature_names, linker_tool_path) )], )) - if "linkstamps" not in existing_feature_names: - result.append(feature( - name = "linkstamps", - flag_sets = [flag_set( - actions = [ - ACTION_NAMES.cpp_link_dynamic_library, - ACTION_NAMES.cpp_link_executable, - ACTION_NAMES.cpp_link_nodeps_dynamic_library, - ACTION_NAMES.lto_index_for_dynamic_library, - ACTION_NAMES.lto_index_for_executable, - ACTION_NAMES.lto_index_for_nodeps_dynamic_library, - ], - flag_groups = [flag_group( - expand_if_available = "linkstamp_paths", - iterate_over = "linkstamp_paths", - flags = ["%{linkstamp_paths}"], - )], - )], - )) - if "output_execpath_flags" not in existing_feature_names: result.append(feature( name = "output_execpath_flags", @@ -1306,7 +1286,6 @@ def get_legacy_action_configs( tools = [tool(path = gcc_tool_path)], implies = [ "strip_debug_symbols", - "linkstamps", "output_execpath_flags", "runtime_library_search_directories", "library_search_directories", @@ -1335,7 +1314,6 @@ def get_legacy_action_configs( "dynamic_library_linker_tool", "strip_debug_symbols", "shared_flag", - "linkstamps", "output_execpath_flags", "runtime_library_search_directories", "library_search_directories", diff --git a/cc/toolchains/args/BUILD b/cc/toolchains/args/BUILD index 84560353f..aec94f13f 100644 --- a/cc/toolchains/args/BUILD +++ b/cc/toolchains/args/BUILD @@ -34,7 +34,6 @@ cc_feature_set( "//cc/toolchains/args/compiler_output_flags:feature", "//cc/toolchains/args/fission_flags:feature", "//cc/toolchains/args/link_flags:feature", - "//cc/toolchains/args/linkstamp_flags:feature", "//cc/toolchains/args/library_search_directories:feature", "//cc/toolchains/args/dependency_file:feature", "//cc/toolchains/args/compile_flags:feature", # NOTE: This should come below default flags so user flags can override them diff --git a/cc/toolchains/args/linkstamp_flags/BUILD b/cc/toolchains/args/linkstamp_flags/BUILD deleted file mode 100644 index a2e2bf06c..000000000 --- a/cc/toolchains/args/linkstamp_flags/BUILD +++ /dev/null @@ -1,18 +0,0 @@ -load("//cc/toolchains:args.bzl", "cc_args") -load("//cc/toolchains:feature.bzl", "cc_feature") - -cc_feature( - name = "feature", - args = [":flags"], - overrides = "//cc/toolchains/features/legacy:linkstamps", - visibility = ["//visibility:public"], -) - -cc_args( - name = "flags", - actions = ["//cc/toolchains/actions:link_actions"], - args = ["{linkstamp_paths}"], - format = {"linkstamp_paths": "//cc/toolchains/variables:linkstamp_paths"}, - iterate_over = "//cc/toolchains/variables:linkstamp_paths", - requires_not_none = "//cc/toolchains/variables:linkstamp_paths", -) diff --git a/cc/toolchains/features/legacy/BUILD b/cc/toolchains/features/legacy/BUILD index 7bfe592e4..8bec1b58e 100644 --- a/cc/toolchains/features/legacy/BUILD +++ b/cc/toolchains/features/legacy/BUILD @@ -101,12 +101,6 @@ cc_external_feature( overridable = True, ) -cc_external_feature( - name = "linkstamps", - feature_name = "linkstamps", - overridable = True, -) - cc_external_feature( name = "output_execpath_flags", feature_name = "output_execpath_flags", @@ -267,7 +261,6 @@ cc_feature_set( ":build_interface_libraries", ":dynamic_library_linker_tool", ":shared_flag", - ":linkstamps", ":output_execpath_flags", ":runtime_library_search_directories", ":library_search_directories", diff --git a/cc/toolchains/variables/BUILD b/cc/toolchains/variables/BUILD index 2e9c0a358..759dd44c7 100644 --- a/cc/toolchains/variables/BUILD +++ b/cc/toolchains/variables/BUILD @@ -274,12 +274,6 @@ cc_variable( type = types.option(types.file), ) -cc_variable( - name = "linkstamp_paths", - actions = ["//cc/toolchains/actions:link_actions"], - type = types.option(types.list(types.file)), -) - cc_variable( name = "lto_indexing_bitcode_file", actions = ["//cc/toolchains/actions:compile_actions"], @@ -523,7 +517,6 @@ cc_builtin_variables( ":libraries_to_link", ":library_search_directories", ":linker_param_file", - ":linkstamp_paths", ":lto_indexing_bitcode_file", ":module_files", ":module_map_file",