diff options
author | 2018-02-16 04:14:52 -0800 | |
---|---|---|
committer | 2018-02-16 04:18:17 -0800 | |
commit | ec2cb2526e2ed50580b9f173e59c93b71121aa8d (patch) | |
tree | b249ff51fd70245e96932ed15d6a25ba3ea09072 /tools | |
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')
-rw-r--r-- | tools/cpp/CROSSTOOL.tpl | 23 | ||||
-rw-r--r-- | tools/osx/crosstool/CROSSTOOL.tpl | 270 |
2 files changed, 0 insertions, 293 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' diff --git a/tools/osx/crosstool/CROSSTOOL.tpl b/tools/osx/crosstool/CROSSTOOL.tpl index 0fa5971f58..8499e0096b 100644 --- a/tools/osx/crosstool/CROSSTOOL.tpl +++ b/tools/osx/crosstool/CROSSTOOL.tpl @@ -1144,27 +1144,6 @@ toolchain { } } feature { - name: "linkopts_file" - flag_set { - action: "c++-link-executable" - action: "c++-link-dynamic-library" - flag_group { - flag: "-Wl,@%{linkopts_file}" - } - expand_if_all_available: "linkopts_file" - } - flag_set { - 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}" - } - expand_if_all_available: "linkopts_file" - } - } - feature { name: "linker_param_file" flag_set { action: "c++-link-executable" @@ -1648,7 +1627,6 @@ toolchain { implies: "force_pic_flags" implies: "legacy_link_flags" implies: "strip_debug_symbols" - implies: "linkopts_file" implies: "linker_param_file" implies: "version_min" implies: "apple_env" @@ -1672,7 +1650,6 @@ toolchain { implies: "input_param_flags" implies: "legacy_link_flags" implies: "strip_debug_symbols" - implies: "linkopts_file" implies: "linker_param_file" implies: "version_min" implies: "apple_env" @@ -1689,7 +1666,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -1704,7 +1680,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -1719,7 +1694,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -1734,7 +1708,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -2885,27 +2858,6 @@ toolchain { } } feature { - name: "linkopts_file" - flag_set { - action: "c++-link-executable" - action: "c++-link-dynamic-library" - flag_group { - flag: "-Wl,@%{linkopts_file}" - } - expand_if_all_available: "linkopts_file" - } - flag_set { - 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}" - } - expand_if_all_available: "linkopts_file" - } - } - feature { name: "linker_param_file" flag_set { action: "c++-link-executable" @@ -3391,7 +3343,6 @@ toolchain { implies: "force_pic_flags" implies: "legacy_link_flags" implies: "strip_debug_symbols" - implies: "linkopts_file" implies: "linker_param_file" implies: "version_min" implies: "apple_env" @@ -3415,7 +3366,6 @@ toolchain { implies: "input_param_flags" implies: "legacy_link_flags" implies: "strip_debug_symbols" - implies: "linkopts_file" implies: "linker_param_file" implies: "version_min" implies: "apple_env" @@ -3432,7 +3382,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -3447,7 +3396,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -3462,7 +3410,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -3477,7 +3424,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -4630,27 +4576,6 @@ toolchain { } } feature { - name: "linkopts_file" - flag_set { - action: "c++-link-executable" - action: "c++-link-dynamic-library" - flag_group { - flag: "-Wl,@%{linkopts_file}" - } - expand_if_all_available: "linkopts_file" - } - flag_set { - 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}" - } - expand_if_all_available: "linkopts_file" - } - } - feature { name: "linker_param_file" flag_set { action: "c++-link-executable" @@ -5136,7 +5061,6 @@ toolchain { implies: "force_pic_flags" implies: "legacy_link_flags" implies: "strip_debug_symbols" - implies: "linkopts_file" implies: "linker_param_file" implies: "version_min" implies: "apple_env" @@ -5160,7 +5084,6 @@ toolchain { implies: "input_param_flags" implies: "legacy_link_flags" implies: "strip_debug_symbols" - implies: "linkopts_file" implies: "linker_param_file" implies: "version_min" implies: "apple_env" @@ -5177,7 +5100,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -5192,7 +5114,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -5207,7 +5128,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -5222,7 +5142,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -6395,27 +6314,6 @@ toolchain { } } feature { - name: "linkopts_file" - flag_set { - action: "c++-link-executable" - action: "c++-link-dynamic-library" - flag_group { - flag: "-Wl,@%{linkopts_file}" - } - expand_if_all_available: "linkopts_file" - } - flag_set { - 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}" - } - expand_if_all_available: "linkopts_file" - } - } - feature { name: "linker_param_file" flag_set { action: "c++-link-executable" @@ -6908,7 +6806,6 @@ toolchain { implies: "force_pic_flags" implies: "legacy_link_flags" implies: "strip_debug_symbols" - implies: "linkopts_file" implies: "linker_param_file" implies: "version_min" implies: "apple_env" @@ -6933,7 +6830,6 @@ toolchain { implies: "input_param_flags" implies: "legacy_link_flags" implies: "strip_debug_symbols" - implies: "linkopts_file" implies: "linker_param_file" implies: "version_min" implies: "apple_env" @@ -6951,7 +6847,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -6966,7 +6861,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -6981,7 +6875,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -6996,7 +6889,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -8147,27 +8039,6 @@ toolchain { } } feature { - name: "linkopts_file" - flag_set { - action: "c++-link-executable" - action: "c++-link-dynamic-library" - flag_group { - flag: "-Wl,@%{linkopts_file}" - } - expand_if_all_available: "linkopts_file" - } - flag_set { - 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}" - } - expand_if_all_available: "linkopts_file" - } - } - feature { name: "linker_param_file" flag_set { action: "c++-link-executable" @@ -8653,7 +8524,6 @@ toolchain { implies: "force_pic_flags" implies: "legacy_link_flags" implies: "strip_debug_symbols" - implies: "linkopts_file" implies: "linker_param_file" implies: "version_min" implies: "apple_env" @@ -8677,7 +8547,6 @@ toolchain { implies: "input_param_flags" implies: "legacy_link_flags" implies: "strip_debug_symbols" - implies: "linkopts_file" implies: "linker_param_file" implies: "version_min" implies: "apple_env" @@ -8694,7 +8563,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -8709,7 +8577,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -8724,7 +8591,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -8739,7 +8605,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -9880,27 +9745,6 @@ toolchain { } } feature { - name: "linkopts_file" - flag_set { - action: "c++-link-executable" - action: "c++-link-dynamic-library" - flag_group { - flag: "-Wl,@%{linkopts_file}" - } - expand_if_all_available: "linkopts_file" - } - flag_set { - 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}" - } - expand_if_all_available: "linkopts_file" - } - } - feature { name: "linker_param_file" flag_set { action: "c++-link-executable" @@ -10384,7 +10228,6 @@ toolchain { implies: "force_pic_flags" implies: "legacy_link_flags" implies: "strip_debug_symbols" - implies: "linkopts_file" implies: "linker_param_file" implies: "version_min" implies: "apple_env" @@ -10408,7 +10251,6 @@ toolchain { implies: "input_param_flags" implies: "legacy_link_flags" implies: "strip_debug_symbols" - implies: "linkopts_file" implies: "linker_param_file" implies: "version_min" implies: "apple_env" @@ -10425,7 +10267,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -10440,7 +10281,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -10455,7 +10295,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -10470,7 +10309,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -11613,27 +11451,6 @@ toolchain { } } feature { - name: "linkopts_file" - flag_set { - action: "c++-link-executable" - action: "c++-link-dynamic-library" - flag_group { - flag: "-Wl,@%{linkopts_file}" - } - expand_if_all_available: "linkopts_file" - } - flag_set { - 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}" - } - expand_if_all_available: "linkopts_file" - } - } - feature { name: "linker_param_file" flag_set { action: "c++-link-executable" @@ -12117,7 +11934,6 @@ toolchain { implies: "force_pic_flags" implies: "legacy_link_flags" implies: "strip_debug_symbols" - implies: "linkopts_file" implies: "linker_param_file" implies: "version_min" implies: "apple_env" @@ -12141,7 +11957,6 @@ toolchain { implies: "input_param_flags" implies: "legacy_link_flags" implies: "strip_debug_symbols" - implies: "linkopts_file" implies: "linker_param_file" implies: "version_min" implies: "apple_env" @@ -12158,7 +11973,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -12173,7 +11987,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -12188,7 +12001,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -12203,7 +12015,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -13366,27 +13177,6 @@ toolchain { } } feature { - name: "linkopts_file" - flag_set { - action: "c++-link-executable" - action: "c++-link-dynamic-library" - flag_group { - flag: "-Wl,@%{linkopts_file}" - } - expand_if_all_available: "linkopts_file" - } - flag_set { - 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}" - } - expand_if_all_available: "linkopts_file" - } - } - feature { name: "linker_param_file" flag_set { action: "c++-link-executable" @@ -13877,7 +13667,6 @@ toolchain { implies: "force_pic_flags" implies: "legacy_link_flags" implies: "strip_debug_symbols" - implies: "linkopts_file" implies: "linker_param_file" implies: "version_min" implies: "apple_env" @@ -13902,7 +13691,6 @@ toolchain { implies: "input_param_flags" implies: "legacy_link_flags" implies: "strip_debug_symbols" - implies: "linkopts_file" implies: "linker_param_file" implies: "version_min" implies: "apple_env" @@ -13920,7 +13708,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -13935,7 +13722,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -13950,7 +13736,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -13965,7 +13750,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -15106,27 +14890,6 @@ toolchain { } } feature { - name: "linkopts_file" - flag_set { - action: "c++-link-executable" - action: "c++-link-dynamic-library" - flag_group { - flag: "-Wl,@%{linkopts_file}" - } - expand_if_all_available: "linkopts_file" - } - flag_set { - 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}" - } - expand_if_all_available: "linkopts_file" - } - } - feature { name: "linker_param_file" flag_set { action: "c++-link-executable" @@ -15610,7 +15373,6 @@ toolchain { implies: "force_pic_flags" implies: "legacy_link_flags" implies: "strip_debug_symbols" - implies: "linkopts_file" implies: "linker_param_file" implies: "version_min" implies: "apple_env" @@ -15634,7 +15396,6 @@ toolchain { implies: "input_param_flags" implies: "legacy_link_flags" implies: "strip_debug_symbols" - implies: "linkopts_file" implies: "linker_param_file" implies: "version_min" implies: "apple_env" @@ -15651,7 +15412,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -15666,7 +15426,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -15681,7 +15440,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -15696,7 +15454,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -16840,27 +16597,6 @@ toolchain { } } feature { - name: "linkopts_file" - flag_set { - action: "c++-link-executable" - action: "c++-link-dynamic-library" - flag_group { - flag: "-Wl,@%{linkopts_file}" - } - expand_if_all_available: "linkopts_file" - } - flag_set { - 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}" - } - expand_if_all_available: "linkopts_file" - } - } - feature { name: "linker_param_file" flag_set { action: "c++-link-executable" @@ -17344,7 +17080,6 @@ toolchain { implies: "force_pic_flags" implies: "legacy_link_flags" implies: "strip_debug_symbols" - implies: "linkopts_file" implies: "linker_param_file" implies: "version_min" implies: "apple_env" @@ -17368,7 +17103,6 @@ toolchain { implies: "input_param_flags" implies: "legacy_link_flags" implies: "strip_debug_symbols" - implies: "linkopts_file" implies: "linker_param_file" implies: "version_min" implies: "apple_env" @@ -17385,7 +17119,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -17400,7 +17133,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -17415,7 +17147,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } @@ -17430,7 +17161,6 @@ toolchain { implies: "runtime_root_flags" implies: "archiver_flags" implies: "input_param_flags" - implies: "linkopts_file" implies: "linker_param_file" implies: "apple_env" } |