diff options
| author |  plf <plf@google.com> | 2018-02-16 04:14:52 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-16 04:18:17 -0800 |
| commit | ec2cb2526e2ed50580b9f173e59c93b71121aa8d (patch) | |
| tree | b249ff51fd70245e96932ed15d6a25ba3ea09072 /tools/cpp/CROSSTOOL.tpl | |
| parent | 2195b1c4a17624be1f4863c9112af0664571a5b7 (diff) | |
Automated rollback of commit c7e343ad314aeab6283b5939bc8126a112140a11.
*** Reason for rollback ***
Rolling back after having come up with a more principled solution in b/73047818 that will add a more generic attribute called additional_linker_inputs so that users can depend on any file of any type and reference it from linkopts.
*** Original change description ***
C++: Allows adding linkopts through file.
The file can be generated during execution by a different rule.
RELNOTES:none
PiperOrigin-RevId: 185977745
Diffstat (limited to 'tools/cpp/CROSSTOOL.tpl')
| -rw-r--r-- | tools/cpp/CROSSTOOL.tpl | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/tools/cpp/CROSSTOOL.tpl b/tools/cpp/CROSSTOOL.tpl index d69036d39d..8f87512fd8 100644 --- a/tools/cpp/CROSSTOOL.tpl +++ b/tools/cpp/CROSSTOOL.tpl @@ -424,7 +424,6 @@ toolchain { implies: 'input_param_flags' implies: 'legacy_link_flags' implies: 'linker_subsystem_flag' - implies: 'linkopts_file' implies: 'linker_param_file' implies: 'msvc_env' implies: 'use_linker' @@ -444,7 +443,6 @@ toolchain { implies: 'input_param_flags' implies: 'legacy_link_flags' implies: 'linker_subsystem_flag' - implies: 'linkopts_file' implies: 'linker_param_file' implies: 'msvc_env' implies: 'use_linker' @@ -462,7 +460,6 @@ toolchain { implies: 'nologo' implies: 'archiver_flags' implies: 'input_param_flags' - implies: 'linkopts_file' implies: 'linker_param_file' implies: 'msvc_env' } @@ -476,7 +473,6 @@ toolchain { implies: 'nologo' implies: 'archiver_flags' implies: 'input_param_flags' - implies: 'linkopts_file' implies: 'linker_param_file' implies: 'msvc_env' } @@ -492,7 +488,6 @@ toolchain { implies: 'nologo' implies: 'archiver_flags' implies: 'input_param_flags' - implies: 'linkopts_file' implies: 'linker_param_file' implies: 'msvc_env' } @@ -506,7 +501,6 @@ toolchain { implies: 'nologo' implies: 'archiver_flags' implies: 'input_param_flags' - implies: 'linkopts_file' implies: 'linker_param_file' implies: 'msvc_env' } @@ -518,7 +512,6 @@ toolchain { tool_path: '%{msvc_lib_path}' } implies: 'nologo' - implies: 'linkopts_file' implies: 'linker_param_file' implies: 'msvc_env' } @@ -855,22 +848,6 @@ toolchain { } feature { - name: 'linkopts_file' - flag_set { - expand_if_all_available: 'linkopts_file' - action: 'c++-link-executable' - action: 'c++-link-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: '@%{linkopts_file}' - } - } - } - - feature { name: 'linker_param_file' flag_set { expand_if_all_available: 'linker_param_file' |