diff options
author | 2018-03-12 08:39:27 -0700 | |
---|---|---|
committer | 2018-03-12 08:41:00 -0700 | |
commit | fba6f119a2807142dd35471980fa49ee1cf7335e (patch) | |
tree | 92a7ca5b60cd6872780941ba9dfb8dcd7003a5bf /tools/cpp/CROSSTOOL.tpl | |
parent | e4c8509ace6baf5182379738b7834287228116cd (diff) |
Unify action_configs for static libraries
We don't need to separate them into 4 different flavours, all crosstools define
them identically anyway.
RELNOTES: CppRules: Unified action_configs for static libraries
From now on only c++-link-static-library is read.
PiperOrigin-RevId: 188726352
Diffstat (limited to 'tools/cpp/CROSSTOOL.tpl')
-rw-r--r-- | tools/cpp/CROSSTOOL.tpl | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/tools/cpp/CROSSTOOL.tpl b/tools/cpp/CROSSTOOL.tpl index dce98cd835..518bc4453c 100644 --- a/tools/cpp/CROSSTOOL.tpl +++ b/tools/cpp/CROSSTOOL.tpl @@ -285,9 +285,6 @@ toolchain { action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" - action: "c++-link-alwayslink-static-library" - action: "c++-link-pic-static-library" - action: "c++-link-alwayslink-pic-static-library" flag_group { flag: "/nologo" } @@ -488,47 +485,6 @@ toolchain { } action_config { - config_name: 'c++-link-alwayslink-static-library' - action_name: 'c++-link-alwayslink-static-library' - tool { - tool_path: '%{msvc_lib_path}' - } - implies: 'nologo' - implies: 'archiver_flags' - implies: 'input_param_flags' - implies: 'linker_param_file' - implies: 'msvc_env' - } - - # TODO(pcloudy): The following action_config is listed in MANDATORY_LINK_TARGET_TYPES. - # But do we really need them on Windows? - action_config { - config_name: 'c++-link-pic-static-library' - action_name: 'c++-link-pic-static-library' - tool { - tool_path: '%{msvc_lib_path}' - } - implies: 'nologo' - implies: 'archiver_flags' - implies: 'input_param_flags' - implies: 'linker_param_file' - implies: 'msvc_env' - } - - action_config { - config_name: 'c++-link-alwayslink-pic-static-library' - action_name: 'c++-link-alwayslink-pic-static-library' - tool { - tool_path: '%{msvc_lib_path}' - } - implies: 'nologo' - implies: 'archiver_flags' - implies: 'input_param_flags' - implies: 'linker_param_file' - implies: 'msvc_env' - } - - action_config { config_name: 'c++-link-interface-dynamic-library' action_name: 'c++-link-interface-dynamic-library' tool { @@ -574,9 +530,6 @@ toolchain { action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-static-library" - action: "c++-link-alwayslink-static-library" - action: "c++-link-pic-static-library" - action: "c++-link-alwayslink-pic-static-library" env_entry { key: "PATH" value: "%{msvc_env_path}" @@ -725,9 +678,6 @@ toolchain { flag_set { expand_if_all_available: 'output_execpath' action: 'c++-link-static-library' - action: 'c++-link-alwayslink-static-library' - action: 'c++-link-pic-static-library' - action: 'c++-link-alwayslink-pic-static-library' flag_group { flag: '/OUT:%{output_execpath}' } @@ -760,9 +710,6 @@ toolchain { action: 'c++-link-dynamic-library' action: "c++-link-nodeps-dynamic-library" action: 'c++-link-static-library' - action: 'c++-link-alwayslink-static-library' - action: 'c++-link-pic-static-library' - action: 'c++-link-alwayslink-pic-static-library' flag_group { iterate_over: 'libraries_to_link' flag_group { @@ -888,9 +835,6 @@ toolchain { action: 'c++-link-dynamic-library' action: "c++-link-nodeps-dynamic-library" action: 'c++-link-static-library' - action: 'c++-link-alwayslink-static-library' - action: 'c++-link-pic-static-library' - action: 'c++-link-alwayslink-pic-static-library' flag_group { flag: '@%{linker_param_file}' } |