diff options
7 files changed, 5 insertions, 1885 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java index 3f06465378..b2c2c5804a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java @@ -500,33 +500,6 @@ public class CppActionConfigs { " implies: 'archiver_flags'", " implies: 'linker_param_file'", "}", - "action_config {", - " config_name: 'c++-link-alwayslink-static-library'", - " action_name: 'c++-link-alwayslink-static-library'", - " tool {", - " tool_path: '" + arToolPath + "'", - " }", - " implies: 'archiver_flags'", - " implies: 'linker_param_file'", - "}", - "action_config {", - " config_name: 'c++-link-pic-static-library'", - " action_name: 'c++-link-pic-static-library'", - " tool {", - " tool_path: '" + arToolPath + "'", - " }", - " implies: 'archiver_flags'", - " implies: 'linker_param_file'", - "}", - "action_config {", - " config_name: 'c++-link-alwayslink-pic-static-library'", - " action_name: 'c++-link-alwayslink-pic-static-library'", - " tool {", - " tool_path: '" + arToolPath + "'", - " }", - " implies: 'archiver_flags'", - " implies: 'linker_param_file'", - "}", ifTrue( supportsInterfaceSharedLibraries, "feature {", @@ -656,9 +629,6 @@ public class CppActionConfigs { " 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 {", ifLinux(platform, "flag: 'rcsD'", "flag: '%{output_execpath}'"), ifMac( @@ -670,11 +640,8 @@ public class CppActionConfigs { " }", " }", " flag_set { ", - " expand_if_all_available: 'libraries_to_link'", " action: 'c++-link-static-library'", - " action: 'c++-link-alwayslink-static-library'", - " action: 'c++-link-pic-static-library'", - " action: 'c++-link-alwayslink-pic-static-library'", + " expand_if_all_available: 'libraries_to_link'", " flag_group {", " iterate_over: 'libraries_to_link'", " flag_group {", @@ -1129,9 +1096,6 @@ public class CppActionConfigs { " flag_set {", " expand_if_all_available: 'linker_param_file'", " 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}'", " }", diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/Link.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/Link.java index 852e28e8b5..b70ab0a875 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/Link.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/Link.java @@ -152,7 +152,7 @@ public abstract class Link { PIC_STATIC_LIBRARY( ".pic.a", Staticness.STATIC, - "c++-link-pic-static-library", + "c++-link-static-library", Picness.PIC, ArtifactCategory.STATIC_LIBRARY, Executable.NOT_EXECUTABLE), @@ -187,7 +187,7 @@ public abstract class Link { ALWAYS_LINK_STATIC_LIBRARY( ".lo", Staticness.STATIC, - "c++-link-alwayslink-static-library", + "c++-link-static-library", Picness.NOPIC, ArtifactCategory.ALWAYSLINK_STATIC_LIBRARY, Executable.NOT_EXECUTABLE), @@ -196,7 +196,7 @@ public abstract class Link { ALWAYS_LINK_PIC_STATIC_LIBRARY( ".pic.lo", Staticness.STATIC, - "c++-link-alwayslink-pic-static-library", + "c++-link-static-library", Picness.PIC, ArtifactCategory.ALWAYSLINK_STATIC_LIBRARY, Executable.NOT_EXECUTABLE), diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL b/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL index cf9b1b8050..de91e90784 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL +++ b/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL @@ -276,12 +276,9 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" - implies: "c++-link-alwayslink-static-library" - implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" } feature { @@ -352,9 +349,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: "-Wl,-all_load" } @@ -368,9 +362,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: "-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" @@ -382,9 +373,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: "%{runtime_root_flags}" iterate_over: "runtime_root_flags" @@ -396,9 +384,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: "%{runtime_root_entries}" iterate_over: "runtime_root_entries" @@ -410,9 +395,6 @@ toolchain { name: "archiver_flags" 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: "rcs" flag: "%{output_execpath}" @@ -427,9 +409,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: "-L%{library_search_directories}" iterate_over: "library_search_directories" @@ -441,9 +420,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: "%{libopts}" iterate_over: "libopts" @@ -455,9 +431,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: "-Wl,-force_load,%{whole_archive_linker_params}" iterate_over: "whole_archive_linker_params" @@ -469,9 +442,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_input_params}" iterate_over: "linker_input_params" @@ -483,9 +453,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_group { flag: "-Wl,--start-lib" @@ -780,9 +747,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" action: "objc-executable" action: "objc++-executable" env_entry { @@ -1252,9 +1216,6 @@ toolchain { } 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: "@%{linker_param_file}" } @@ -1826,48 +1787,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-alwayslink-static-library" - action_name: "c++-link-alwayslink-static-library" - tool { - tool_path: "mac/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-pic-static-library" - action_name: "c++-link-pic-static-library" - tool { - tool_path: "mac/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-alwayslink-pic-static-library" - action_name: "c++-link-alwayslink-pic-static-library" - tool { - tool_path: "mac/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { config_name: "c++-link-interface-dynamic-library" action_name: "c++-link-interface-dynamic-library" tool { @@ -2131,12 +2050,9 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" - implies: "c++-link-alwayslink-static-library" - implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" } feature { @@ -2207,9 +2123,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: "-Wl,-all_load" } @@ -2223,9 +2136,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: "-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" @@ -2237,9 +2147,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: "%{runtime_root_flags}" iterate_over: "runtime_root_flags" @@ -2251,9 +2158,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: "%{runtime_root_entries}" iterate_over: "runtime_root_entries" @@ -2265,9 +2169,6 @@ toolchain { name: "archiver_flags" 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: "rcs" flag: "%{output_execpath}" @@ -2282,9 +2183,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: "-L%{library_search_directories}" iterate_over: "library_search_directories" @@ -2296,9 +2194,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: "%{libopts}" iterate_over: "libopts" @@ -2310,9 +2205,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: "-Wl,-force_load,%{whole_archive_linker_params}" iterate_over: "whole_archive_linker_params" @@ -2324,9 +2216,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_input_params}" iterate_over: "linker_input_params" @@ -2338,9 +2227,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_group { flag: "-Wl,--start-lib" @@ -2635,9 +2521,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" action: "objc-executable" action: "objc++-executable" env_entry { @@ -3107,9 +2990,6 @@ toolchain { } 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: "@%{linker_param_file}" } @@ -3681,48 +3561,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-alwayslink-static-library" - action_name: "c++-link-alwayslink-static-library" - tool { - tool_path: "mac/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-pic-static-library" - action_name: "c++-link-pic-static-library" - tool { - tool_path: "mac/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-alwayslink-pic-static-library" - action_name: "c++-link-alwayslink-pic-static-library" - tool { - tool_path: "mac/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { config_name: "c++-link-interface-dynamic-library" action_name: "c++-link-interface-dynamic-library" tool { @@ -3981,12 +3819,9 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" - implies: "c++-link-alwayslink-static-library" - implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" } feature { @@ -4057,9 +3892,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: "-Wl,-all_load" } @@ -4073,9 +3905,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: "-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" @@ -4087,9 +3916,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: "%{runtime_root_flags}" iterate_over: "runtime_root_flags" @@ -4101,9 +3927,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: "%{runtime_root_entries}" iterate_over: "runtime_root_entries" @@ -4115,9 +3938,6 @@ toolchain { name: "archiver_flags" 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: "rcs" flag: "%{output_execpath}" @@ -4132,9 +3952,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: "-L%{library_search_directories}" iterate_over: "library_search_directories" @@ -4146,9 +3963,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: "%{libopts}" iterate_over: "libopts" @@ -4160,9 +3974,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: "-Wl,-force_load,%{whole_archive_linker_params}" iterate_over: "whole_archive_linker_params" @@ -4174,9 +3985,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_input_params}" iterate_over: "linker_input_params" @@ -4188,9 +3996,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_group { flag: "-Wl,--start-lib" @@ -4485,9 +4290,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" action: "objc-executable" action: "objc++-executable" env_entry { @@ -4957,9 +4759,6 @@ toolchain { } 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: "@%{linker_param_file}" } @@ -5531,48 +5330,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-alwayslink-static-library" - action_name: "c++-link-alwayslink-static-library" - tool { - tool_path: "mac/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-pic-static-library" - action_name: "c++-link-pic-static-library" - tool { - tool_path: "mac/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-alwayslink-pic-static-library" - action_name: "c++-link-alwayslink-pic-static-library" - tool { - tool_path: "mac/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { config_name: "c++-link-interface-dynamic-library" action_name: "c++-link-interface-dynamic-library" tool { @@ -5831,12 +5588,9 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" - implies: "c++-link-alwayslink-static-library" - implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" } feature { @@ -5907,9 +5661,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: "-Wl,-all_load" } @@ -5923,9 +5674,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: "-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" @@ -5937,9 +5685,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: "%{runtime_root_flags}" iterate_over: "runtime_root_flags" @@ -5951,9 +5696,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: "%{runtime_root_entries}" iterate_over: "runtime_root_entries" @@ -5965,9 +5707,6 @@ toolchain { name: "archiver_flags" 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: "rcs" flag: "%{output_execpath}" @@ -5982,9 +5721,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: "-L%{library_search_directories}" iterate_over: "library_search_directories" @@ -5996,9 +5732,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: "%{libopts}" iterate_over: "libopts" @@ -6010,9 +5743,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: "-Wl,-force_load,%{whole_archive_linker_params}" iterate_over: "whole_archive_linker_params" @@ -6024,9 +5754,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_input_params}" iterate_over: "linker_input_params" @@ -6038,9 +5765,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_group { flag: "-Wl,--start-lib" @@ -6335,9 +6059,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" action: "objc-executable" action: "objc++-executable" env_entry { @@ -6807,9 +6528,6 @@ toolchain { } 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: "@%{linker_param_file}" } @@ -7381,48 +7099,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-alwayslink-static-library" - action_name: "c++-link-alwayslink-static-library" - tool { - tool_path: "mac/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-pic-static-library" - action_name: "c++-link-pic-static-library" - tool { - tool_path: "mac/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-alwayslink-pic-static-library" - action_name: "c++-link-alwayslink-pic-static-library" - tool { - tool_path: "mac/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { config_name: "c++-link-interface-dynamic-library" action_name: "c++-link-interface-dynamic-library" tool { @@ -7685,12 +7361,9 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" - implies: "c++-link-alwayslink-static-library" - implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" } feature { @@ -7761,9 +7434,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: "-Wl,-all_load" } @@ -7777,9 +7447,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: "-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" @@ -7791,9 +7458,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: "%{runtime_root_flags}" iterate_over: "runtime_root_flags" @@ -7805,9 +7469,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: "%{runtime_root_entries}" iterate_over: "runtime_root_entries" @@ -7819,9 +7480,6 @@ toolchain { name: "archiver_flags" 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: "rcs" flag: "%{output_execpath}" @@ -7836,9 +7494,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: "-L%{library_search_directories}" iterate_over: "library_search_directories" @@ -7850,9 +7505,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: "%{libopts}" iterate_over: "libopts" @@ -7864,9 +7516,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: "-Wl,-force_load,%{whole_archive_linker_params}" iterate_over: "whole_archive_linker_params" @@ -7878,9 +7527,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_input_params}" iterate_over: "linker_input_params" @@ -7892,9 +7538,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_group { flag: "-Wl,--start-lib" @@ -8189,9 +7832,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" action: "objc-executable" action: "objc++-executable" env_entry { @@ -8665,9 +8305,6 @@ toolchain { } 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: "@%{linker_param_file}" } @@ -9241,48 +8878,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-alwayslink-static-library" - action_name: "c++-link-alwayslink-static-library" - tool { - tool_path: "iossim/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-pic-static-library" - action_name: "c++-link-pic-static-library" - tool { - tool_path: "iossim/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-alwayslink-pic-static-library" - action_name: "c++-link-alwayslink-pic-static-library" - tool { - tool_path: "iossim/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { config_name: "c++-link-interface-dynamic-library" action_name: "c++-link-interface-dynamic-library" tool { @@ -9545,12 +9140,9 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" - implies: "c++-link-alwayslink-static-library" - implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" } feature { @@ -9621,9 +9213,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: "-Wl,-all_load" } @@ -9637,9 +9226,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: "-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" @@ -9651,9 +9237,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: "%{runtime_root_flags}" iterate_over: "runtime_root_flags" @@ -9665,9 +9248,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: "%{runtime_root_entries}" iterate_over: "runtime_root_entries" @@ -9679,9 +9259,6 @@ toolchain { name: "archiver_flags" 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: "rcs" flag: "%{output_execpath}" @@ -9696,9 +9273,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: "-L%{library_search_directories}" iterate_over: "library_search_directories" @@ -9710,9 +9284,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: "%{libopts}" iterate_over: "libopts" @@ -9724,9 +9295,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: "-Wl,-force_load,%{whole_archive_linker_params}" iterate_over: "whole_archive_linker_params" @@ -9738,9 +9306,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_input_params}" iterate_over: "linker_input_params" @@ -9752,9 +9317,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_group { flag: "-Wl,--start-lib" @@ -10051,9 +9613,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" action: "objc-executable" action: "objc++-executable" env_entry { @@ -10527,9 +10086,6 @@ toolchain { } 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: "@%{linker_param_file}" } @@ -11103,48 +10659,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-alwayslink-static-library" - action_name: "c++-link-alwayslink-static-library" - tool { - tool_path: "watchsim/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-pic-static-library" - action_name: "c++-link-pic-static-library" - tool { - tool_path: "watchsim/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-alwayslink-pic-static-library" - action_name: "c++-link-alwayslink-pic-static-library" - tool { - tool_path: "watchsim/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { config_name: "c++-link-interface-dynamic-library" action_name: "c++-link-interface-dynamic-library" tool { @@ -11408,12 +10922,9 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" - implies: "c++-link-alwayslink-static-library" - implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" } feature { @@ -11484,9 +10995,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: "-Wl,-all_load" } @@ -11500,9 +11008,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: "-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" @@ -11514,9 +11019,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: "%{runtime_root_flags}" iterate_over: "runtime_root_flags" @@ -11528,9 +11030,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: "%{runtime_root_entries}" iterate_over: "runtime_root_entries" @@ -11542,9 +11041,6 @@ toolchain { name: "archiver_flags" 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: "rcs" flag: "%{output_execpath}" @@ -11559,9 +11055,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: "-L%{library_search_directories}" iterate_over: "library_search_directories" @@ -11573,9 +11066,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: "%{libopts}" iterate_over: "libopts" @@ -11587,9 +11077,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: "-Wl,-force_load,%{whole_archive_linker_params}" iterate_over: "whole_archive_linker_params" @@ -11601,9 +11088,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_input_params}" iterate_over: "linker_input_params" @@ -11615,9 +11099,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_group { flag: "-Wl,--start-lib" @@ -11912,9 +11393,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" action: "objc-executable" action: "objc++-executable" env_entry { @@ -12412,9 +11890,6 @@ toolchain { } 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: "@%{linker_param_file}" } @@ -12995,48 +12470,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-alwayslink-static-library" - action_name: "c++-link-alwayslink-static-library" - tool { - tool_path: "tvsim/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-pic-static-library" - action_name: "c++-link-pic-static-library" - tool { - tool_path: "tvsim/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-alwayslink-pic-static-library" - action_name: "c++-link-alwayslink-pic-static-library" - tool { - tool_path: "tvsim/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { config_name: "c++-link-interface-dynamic-library" action_name: "c++-link-interface-dynamic-library" tool { @@ -13299,12 +12732,9 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" - implies: "c++-link-alwayslink-static-library" - implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" } feature { @@ -13375,9 +12805,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: "-Wl,-all_load" } @@ -13391,9 +12818,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: "-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" @@ -13405,9 +12829,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: "%{runtime_root_flags}" iterate_over: "runtime_root_flags" @@ -13419,9 +12840,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: "%{runtime_root_entries}" iterate_over: "runtime_root_entries" @@ -13433,9 +12851,6 @@ toolchain { name: "archiver_flags" 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: "rcs" flag: "%{output_execpath}" @@ -13450,9 +12865,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: "-L%{library_search_directories}" iterate_over: "library_search_directories" @@ -13464,9 +12876,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: "%{libopts}" iterate_over: "libopts" @@ -13478,9 +12887,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: "-Wl,-force_load,%{whole_archive_linker_params}" iterate_over: "whole_archive_linker_params" @@ -13492,9 +12898,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_input_params}" iterate_over: "linker_input_params" @@ -13506,9 +12909,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_group { flag: "-Wl,--start-lib" @@ -13803,9 +13203,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" action: "objc-executable" action: "objc++-executable" env_entry { @@ -14279,9 +13676,6 @@ toolchain { } 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: "@%{linker_param_file}" } @@ -14855,48 +14249,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-alwayslink-static-library" - action_name: "c++-link-alwayslink-static-library" - tool { - tool_path: "iossim/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-pic-static-library" - action_name: "c++-link-pic-static-library" - tool { - tool_path: "iossim/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-alwayslink-pic-static-library" - action_name: "c++-link-alwayslink-pic-static-library" - tool { - tool_path: "iossim/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { config_name: "c++-link-interface-dynamic-library" action_name: "c++-link-interface-dynamic-library" tool { @@ -15159,12 +14511,9 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" - implies: "c++-link-alwayslink-static-library" - implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" } feature { @@ -15235,9 +14584,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: "-Wl,-all_load" } @@ -15251,9 +14597,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: "-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" @@ -15265,9 +14608,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: "%{runtime_root_flags}" iterate_over: "runtime_root_flags" @@ -15279,9 +14619,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: "%{runtime_root_entries}" iterate_over: "runtime_root_entries" @@ -15293,9 +14630,6 @@ toolchain { name: "archiver_flags" 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: "rcs" flag: "%{output_execpath}" @@ -15310,9 +14644,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: "-L%{library_search_directories}" iterate_over: "library_search_directories" @@ -15324,9 +14655,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: "%{libopts}" iterate_over: "libopts" @@ -15338,9 +14666,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: "-Wl,-force_load,%{whole_archive_linker_params}" iterate_over: "whole_archive_linker_params" @@ -15352,9 +14677,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_input_params}" iterate_over: "linker_input_params" @@ -15366,9 +14688,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_group { flag: "-Wl,--start-lib" @@ -15663,9 +14982,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" action: "objc-executable" action: "objc++-executable" env_entry { @@ -16161,9 +15477,6 @@ toolchain { } 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: "@%{linker_param_file}" } @@ -16735,48 +16048,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-alwayslink-static-library" - action_name: "c++-link-alwayslink-static-library" - tool { - tool_path: "ios/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-pic-static-library" - action_name: "c++-link-pic-static-library" - tool { - tool_path: "ios/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-alwayslink-pic-static-library" - action_name: "c++-link-alwayslink-pic-static-library" - tool { - tool_path: "ios/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { config_name: "c++-link-interface-dynamic-library" action_name: "c++-link-interface-dynamic-library" tool { @@ -17039,12 +16310,9 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" - implies: "c++-link-alwayslink-static-library" - implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" } feature { @@ -17115,9 +16383,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: "-Wl,-all_load" } @@ -17131,9 +16396,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: "-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" @@ -17145,9 +16407,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: "%{runtime_root_flags}" iterate_over: "runtime_root_flags" @@ -17159,9 +16418,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: "%{runtime_root_entries}" iterate_over: "runtime_root_entries" @@ -17173,9 +16429,6 @@ toolchain { name: "archiver_flags" 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: "rcs" flag: "%{output_execpath}" @@ -17190,9 +16443,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: "-L%{library_search_directories}" iterate_over: "library_search_directories" @@ -17204,9 +16454,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: "%{libopts}" iterate_over: "libopts" @@ -17218,9 +16465,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: "-Wl,-force_load,%{whole_archive_linker_params}" iterate_over: "whole_archive_linker_params" @@ -17232,9 +16476,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_input_params}" iterate_over: "linker_input_params" @@ -17246,9 +16487,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_group { flag: "-Wl,--start-lib" @@ -17545,9 +16783,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" action: "objc-executable" action: "objc++-executable" env_entry { @@ -18043,9 +17278,6 @@ toolchain { } 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: "@%{linker_param_file}" } @@ -18617,48 +17849,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-alwayslink-static-library" - action_name: "c++-link-alwayslink-static-library" - tool { - tool_path: "watchos/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-pic-static-library" - action_name: "c++-link-pic-static-library" - tool { - tool_path: "watchos/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-alwayslink-pic-static-library" - action_name: "c++-link-alwayslink-pic-static-library" - tool { - tool_path: "watchos/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { config_name: "c++-link-interface-dynamic-library" action_name: "c++-link-interface-dynamic-library" tool { @@ -18922,12 +18112,9 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" - implies: "c++-link-alwayslink-static-library" - implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" } feature { @@ -18998,9 +18185,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: "-Wl,-all_load" } @@ -19014,9 +18198,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: "-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" @@ -19028,9 +18209,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: "%{runtime_root_flags}" iterate_over: "runtime_root_flags" @@ -19042,9 +18220,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: "%{runtime_root_entries}" iterate_over: "runtime_root_entries" @@ -19056,9 +18231,6 @@ toolchain { name: "archiver_flags" 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: "rcs" flag: "%{output_execpath}" @@ -19073,9 +18245,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: "-L%{library_search_directories}" iterate_over: "library_search_directories" @@ -19087,9 +18256,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: "%{libopts}" iterate_over: "libopts" @@ -19101,9 +18267,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: "-Wl,-force_load,%{whole_archive_linker_params}" iterate_over: "whole_archive_linker_params" @@ -19115,9 +18278,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_input_params}" iterate_over: "linker_input_params" @@ -19129,9 +18289,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_group { flag: "-Wl,--start-lib" @@ -19426,9 +18583,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" action: "objc-executable" action: "objc++-executable" env_entry { @@ -19948,9 +19102,6 @@ toolchain { } 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: "@%{linker_param_file}" } @@ -20529,48 +19680,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-alwayslink-static-library" - action_name: "c++-link-alwayslink-static-library" - tool { - tool_path: "tvos/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-pic-static-library" - action_name: "c++-link-pic-static-library" - tool { - tool_path: "tvos/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-alwayslink-pic-static-library" - action_name: "c++-link-alwayslink-pic-static-library" - tool { - tool_path: "tvos/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { config_name: "c++-link-interface-dynamic-library" action_name: "c++-link-interface-dynamic-library" tool { @@ -20833,12 +19942,9 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" - implies: "c++-link-alwayslink-static-library" - implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" } feature { @@ -20909,9 +20015,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: "-Wl,-all_load" } @@ -20925,9 +20028,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: "-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" @@ -20939,9 +20039,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: "%{runtime_root_flags}" iterate_over: "runtime_root_flags" @@ -20953,9 +20050,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: "%{runtime_root_entries}" iterate_over: "runtime_root_entries" @@ -20967,9 +20061,6 @@ toolchain { name: "archiver_flags" 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: "rcs" flag: "%{output_execpath}" @@ -20984,9 +20075,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: "-L%{library_search_directories}" iterate_over: "library_search_directories" @@ -20998,9 +20086,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: "%{libopts}" iterate_over: "libopts" @@ -21012,9 +20097,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: "-Wl,-force_load,%{whole_archive_linker_params}" iterate_over: "whole_archive_linker_params" @@ -21026,9 +20108,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_input_params}" iterate_over: "linker_input_params" @@ -21040,9 +20119,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_group { flag: "-Wl,--start-lib" @@ -21337,9 +20413,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" action: "objc-executable" action: "objc++-executable" env_entry { @@ -21835,9 +20908,6 @@ toolchain { } 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: "@%{linker_param_file}" } @@ -22409,48 +21479,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-alwayslink-static-library" - action_name: "c++-link-alwayslink-static-library" - tool { - tool_path: "ios/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-pic-static-library" - action_name: "c++-link-pic-static-library" - tool { - tool_path: "ios/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-alwayslink-pic-static-library" - action_name: "c++-link-alwayslink-pic-static-library" - tool { - tool_path: "ios/ar_wrapper" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { config_name: "c++-link-interface-dynamic-library" action_name: "c++-link-interface-dynamic-library" tool { diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java index 267005bc4f..d55d3b53a6 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java @@ -318,9 +318,6 @@ public abstract class MockCcSupport { + " 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: 'thinlto_param_file=%{thinlto_param_file}'" + " }" diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java index 3c3a6d41a3..89131cc559 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java @@ -109,10 +109,7 @@ public class CppLinkActionTest extends BuildViewTestCase { Link.LinkTargetType.EXECUTABLE.getActionName(), Link.LinkTargetType.NODEPS_DYNAMIC_LIBRARY.getActionName(), Link.LinkTargetType.DYNAMIC_LIBRARY.getActionName(), - Link.LinkTargetType.STATIC_LIBRARY.getActionName(), - Link.LinkTargetType.PIC_STATIC_LIBRARY.getActionName(), - Link.LinkTargetType.ALWAYS_LINK_STATIC_LIBRARY.getActionName(), - Link.LinkTargetType.ALWAYS_LINK_PIC_STATIC_LIBRARY.getActionName())); + Link.LinkTargetType.STATIC_LIBRARY.getActionName())); } @Test 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}' } diff --git a/tools/osx/crosstool/CROSSTOOL.tpl b/tools/osx/crosstool/CROSSTOOL.tpl index 2ac6454235..038dcdb0db 100644 --- a/tools/osx/crosstool/CROSSTOOL.tpl +++ b/tools/osx/crosstool/CROSSTOOL.tpl @@ -250,12 +250,9 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" - implies: "c++-link-alwayslink-static-library" - implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" } feature { @@ -328,9 +325,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: "-Wl,-all_load" } @@ -341,9 +335,6 @@ toolchain { name: "archiver_flags" 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: "rcs" flag: "%{output_execpath}" @@ -358,9 +349,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: "-Wl,-rpath,@loader_path/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" @@ -372,9 +360,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: "%{runtime_root_flags}" iterate_over: "runtime_root_flags" @@ -386,9 +371,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: "%{runtime_root_entries}" iterate_over: "runtime_root_entries" @@ -403,9 +385,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: "-L%{library_search_directories}" iterate_over: "library_search_directories" @@ -417,9 +396,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: "%{libopts}" iterate_over: "libopts" @@ -431,9 +407,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: "-Wl,-force_load,%{whole_archive_linker_params}" iterate_over: "whole_archive_linker_params" @@ -445,9 +418,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_input_params}" iterate_over: "linker_input_params" @@ -459,9 +429,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_group { flag: "-Wl,--start-lib" @@ -1021,9 +988,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" action: "c++-link-interface-dynamic-library" action: "objc-executable" action: "objc++-executable" @@ -1180,9 +1144,6 @@ toolchain { } 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: "@%{linker_param_file}" } @@ -1718,48 +1679,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-alwayslink-static-library" - action_name: "c++-link-alwayslink-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-pic-static-library" - action_name: "c++-link-pic-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-alwayslink-pic-static-library" - action_name: "c++-link-alwayslink-pic-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { config_name: "c++-link-interface-dynamic-library" action_name: "c++-link-interface-dynamic-library" tool { @@ -2008,12 +1927,9 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" - implies: "c++-link-alwayslink-static-library" - implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" } feature { @@ -2086,9 +2002,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: "-Wl,-all_load" } @@ -2099,9 +2012,6 @@ toolchain { name: "archiver_flags" 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: "rcs" flag: "%{output_execpath}" @@ -2116,9 +2026,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: "-Wl,-rpath,@loader_path/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" @@ -2130,9 +2037,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: "%{runtime_root_flags}" iterate_over: "runtime_root_flags" @@ -2144,9 +2048,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: "%{runtime_root_entries}" iterate_over: "runtime_root_entries" @@ -2161,9 +2062,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: "-L%{library_search_directories}" iterate_over: "library_search_directories" @@ -2175,9 +2073,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: "%{libopts}" iterate_over: "libopts" @@ -2189,9 +2084,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: "-Wl,-force_load,%{whole_archive_linker_params}" iterate_over: "whole_archive_linker_params" @@ -2203,9 +2095,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_input_params}" iterate_over: "linker_input_params" @@ -2217,9 +2106,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_group { flag: "-Wl,--start-lib" @@ -2779,9 +2665,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" action: "c++-link-interface-dynamic-library" action: "objc-executable" action: "objc++-executable" @@ -2943,9 +2826,6 @@ toolchain { } 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: "@%{linker_param_file}" } @@ -3483,48 +3363,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-alwayslink-static-library" - action_name: "c++-link-alwayslink-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-pic-static-library" - action_name: "c++-link-pic-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-alwayslink-pic-static-library" - action_name: "c++-link-alwayslink-pic-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { config_name: "c++-link-interface-dynamic-library" action_name: "c++-link-interface-dynamic-library" tool { @@ -3773,12 +3611,9 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" - implies: "c++-link-alwayslink-static-library" - implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" } feature { @@ -3851,9 +3686,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: "-Wl,-all_load" } @@ -3864,9 +3696,6 @@ toolchain { name: "archiver_flags" 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: "rcs" flag: "%{output_execpath}" @@ -3881,9 +3710,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: "-Wl,-rpath,@loader_path/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" @@ -3895,9 +3721,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: "%{runtime_root_flags}" iterate_over: "runtime_root_flags" @@ -3909,9 +3732,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: "%{runtime_root_entries}" iterate_over: "runtime_root_entries" @@ -3926,9 +3746,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: "-L%{library_search_directories}" iterate_over: "library_search_directories" @@ -3940,9 +3757,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: "%{libopts}" iterate_over: "libopts" @@ -3954,9 +3768,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: "-Wl,-force_load,%{whole_archive_linker_params}" iterate_over: "whole_archive_linker_params" @@ -3968,9 +3779,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_input_params}" iterate_over: "linker_input_params" @@ -3982,9 +3790,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_group { flag: "-Wl,--start-lib" @@ -4546,9 +4351,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" action: "c++-link-interface-dynamic-library" action: "objc-executable" action: "objc++-executable" @@ -4710,9 +4512,6 @@ toolchain { } 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: "@%{linker_param_file}" } @@ -5250,48 +5049,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-alwayslink-static-library" - action_name: "c++-link-alwayslink-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-pic-static-library" - action_name: "c++-link-pic-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-alwayslink-pic-static-library" - action_name: "c++-link-alwayslink-pic-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { config_name: "c++-link-interface-dynamic-library" action_name: "c++-link-interface-dynamic-library" tool { @@ -5541,12 +5298,9 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" - implies: "c++-link-alwayslink-static-library" - implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" } feature { @@ -5619,9 +5373,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: "-Wl,-all_load" } @@ -5632,9 +5383,6 @@ toolchain { name: "archiver_flags" 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: "rcs" flag: "%{output_execpath}" @@ -5649,9 +5397,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: "-Wl,-rpath,@loader_path/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" @@ -5663,9 +5408,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: "%{runtime_root_flags}" iterate_over: "runtime_root_flags" @@ -5677,9 +5419,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: "%{runtime_root_entries}" iterate_over: "runtime_root_entries" @@ -5694,9 +5433,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: "-L%{library_search_directories}" iterate_over: "library_search_directories" @@ -5708,9 +5444,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: "%{libopts}" iterate_over: "libopts" @@ -5722,9 +5455,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: "-Wl,-force_load,%{whole_archive_linker_params}" iterate_over: "whole_archive_linker_params" @@ -5736,9 +5466,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_input_params}" iterate_over: "linker_input_params" @@ -5750,9 +5477,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_group { flag: "-Wl,--start-lib" @@ -6312,9 +6036,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" action: "c++-link-interface-dynamic-library" action: "objc-executable" action: "objc++-executable" @@ -6497,9 +6218,6 @@ toolchain { } 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: "@%{linker_param_file}" } @@ -7047,48 +6765,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-alwayslink-static-library" - action_name: "c++-link-alwayslink-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-pic-static-library" - action_name: "c++-link-pic-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-alwayslink-pic-static-library" - action_name: "c++-link-alwayslink-pic-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { config_name: "c++-link-interface-dynamic-library" action_name: "c++-link-interface-dynamic-library" tool { @@ -7337,12 +7013,9 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" - implies: "c++-link-alwayslink-static-library" - implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" } feature { @@ -7415,9 +7088,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: "-Wl,-all_load" } @@ -7428,9 +7098,6 @@ toolchain { name: "archiver_flags" 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: "rcs" flag: "%{output_execpath}" @@ -7445,9 +7112,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: "-Wl,-rpath,@loader_path/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" @@ -7459,9 +7123,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: "%{runtime_root_flags}" iterate_over: "runtime_root_flags" @@ -7473,9 +7134,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: "%{runtime_root_entries}" iterate_over: "runtime_root_entries" @@ -7490,9 +7148,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: "-L%{library_search_directories}" iterate_over: "library_search_directories" @@ -7504,9 +7159,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: "%{libopts}" iterate_over: "libopts" @@ -7518,9 +7170,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: "-Wl,-force_load,%{whole_archive_linker_params}" iterate_over: "whole_archive_linker_params" @@ -7532,9 +7181,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_input_params}" iterate_over: "linker_input_params" @@ -7546,9 +7192,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_group { flag: "-Wl,--start-lib" @@ -8108,9 +7751,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" action: "c++-link-interface-dynamic-library" action: "objc-executable" action: "objc++-executable" @@ -8272,9 +7912,6 @@ toolchain { } 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: "@%{linker_param_file}" } @@ -8812,48 +8449,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-alwayslink-static-library" - action_name: "c++-link-alwayslink-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-pic-static-library" - action_name: "c++-link-pic-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-alwayslink-pic-static-library" - action_name: "c++-link-alwayslink-pic-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { config_name: "c++-link-interface-dynamic-library" action_name: "c++-link-interface-dynamic-library" tool { @@ -9102,12 +8697,9 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" - implies: "c++-link-alwayslink-static-library" - implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" } feature { @@ -9180,9 +8772,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: "-Wl,-all_load" } @@ -9193,9 +8782,6 @@ toolchain { name: "archiver_flags" 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: "rcs" flag: "%{output_execpath}" @@ -9210,9 +8796,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: "-Wl,-rpath,@loader_path/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" @@ -9224,9 +8807,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: "%{runtime_root_flags}" iterate_over: "runtime_root_flags" @@ -9238,9 +8818,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: "%{runtime_root_entries}" iterate_over: "runtime_root_entries" @@ -9255,9 +8832,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: "-L%{library_search_directories}" iterate_over: "library_search_directories" @@ -9269,9 +8843,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: "%{libopts}" iterate_over: "libopts" @@ -9283,9 +8854,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: "-Wl,-force_load,%{whole_archive_linker_params}" iterate_over: "whole_archive_linker_params" @@ -9297,9 +8865,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_input_params}" iterate_over: "linker_input_params" @@ -9311,9 +8876,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_group { flag: "-Wl,--start-lib" @@ -9873,9 +9435,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" action: "c++-link-interface-dynamic-library" action: "objc-executable" action: "objc++-executable" @@ -10027,9 +9586,6 @@ toolchain { } 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: "@%{linker_param_file}" } @@ -10565,48 +10121,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-alwayslink-static-library" - action_name: "c++-link-alwayslink-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-pic-static-library" - action_name: "c++-link-pic-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-alwayslink-pic-static-library" - action_name: "c++-link-alwayslink-pic-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { config_name: "c++-link-interface-dynamic-library" action_name: "c++-link-interface-dynamic-library" tool { @@ -10855,12 +10369,9 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" - implies: "c++-link-alwayslink-static-library" - implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" } feature { @@ -10933,9 +10444,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: "-Wl,-all_load" } @@ -10946,9 +10454,6 @@ toolchain { name: "archiver_flags" 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: "rcs" flag: "%{output_execpath}" @@ -10963,9 +10468,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: "-Wl,-rpath,@loader_path/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" @@ -10977,9 +10479,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: "%{runtime_root_flags}" iterate_over: "runtime_root_flags" @@ -10991,9 +10490,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: "%{runtime_root_entries}" iterate_over: "runtime_root_entries" @@ -11008,9 +10504,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: "-L%{library_search_directories}" iterate_over: "library_search_directories" @@ -11022,9 +10515,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: "%{libopts}" iterate_over: "libopts" @@ -11036,9 +10526,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: "-Wl,-force_load,%{whole_archive_linker_params}" iterate_over: "whole_archive_linker_params" @@ -11050,9 +10537,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_input_params}" iterate_over: "linker_input_params" @@ -11064,9 +10548,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_group { flag: "-Wl,--start-lib" @@ -11628,9 +11109,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" action: "c++-link-interface-dynamic-library" action: "objc-executable" action: "objc++-executable" @@ -11782,9 +11260,6 @@ toolchain { } 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: "@%{linker_param_file}" } @@ -12320,48 +11795,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-alwayslink-static-library" - action_name: "c++-link-alwayslink-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-pic-static-library" - action_name: "c++-link-pic-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-alwayslink-pic-static-library" - action_name: "c++-link-alwayslink-pic-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { config_name: "c++-link-interface-dynamic-library" action_name: "c++-link-interface-dynamic-library" tool { @@ -12611,12 +12044,9 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" - implies: "c++-link-alwayslink-static-library" - implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" } feature { @@ -12689,9 +12119,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: "-Wl,-all_load" } @@ -12702,9 +12129,6 @@ toolchain { name: "archiver_flags" 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: "rcs" flag: "%{output_execpath}" @@ -12719,9 +12143,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: "-Wl,-rpath,@loader_path/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" @@ -12733,9 +12154,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: "%{runtime_root_flags}" iterate_over: "runtime_root_flags" @@ -12747,9 +12165,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: "%{runtime_root_entries}" iterate_over: "runtime_root_entries" @@ -12764,9 +12179,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: "-L%{library_search_directories}" iterate_over: "library_search_directories" @@ -12778,9 +12190,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: "%{libopts}" iterate_over: "libopts" @@ -12792,9 +12201,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: "-Wl,-force_load,%{whole_archive_linker_params}" iterate_over: "whole_archive_linker_params" @@ -12806,9 +12212,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_input_params}" iterate_over: "linker_input_params" @@ -12820,9 +12223,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_group { flag: "-Wl,--start-lib" @@ -13382,9 +12782,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" action: "c++-link-interface-dynamic-library" action: "objc-executable" action: "objc++-executable" @@ -13557,9 +12954,6 @@ toolchain { } 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: "@%{linker_param_file}" } @@ -14105,48 +13499,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-alwayslink-static-library" - action_name: "c++-link-alwayslink-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-pic-static-library" - action_name: "c++-link-pic-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-alwayslink-pic-static-library" - action_name: "c++-link-alwayslink-pic-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { config_name: "c++-link-interface-dynamic-library" action_name: "c++-link-interface-dynamic-library" tool { @@ -14395,12 +13747,9 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" - implies: "c++-link-alwayslink-static-library" - implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" } feature { @@ -14473,9 +13822,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: "-Wl,-all_load" } @@ -14486,9 +13832,6 @@ toolchain { name: "archiver_flags" 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: "rcs" flag: "%{output_execpath}" @@ -14503,9 +13846,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: "-Wl,-rpath,@loader_path/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" @@ -14517,9 +13857,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: "%{runtime_root_flags}" iterate_over: "runtime_root_flags" @@ -14531,9 +13868,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: "%{runtime_root_entries}" iterate_over: "runtime_root_entries" @@ -14548,9 +13882,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: "-L%{library_search_directories}" iterate_over: "library_search_directories" @@ -14562,9 +13893,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: "%{libopts}" iterate_over: "libopts" @@ -14576,9 +13904,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: "-Wl,-force_load,%{whole_archive_linker_params}" iterate_over: "whole_archive_linker_params" @@ -14590,9 +13915,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_input_params}" iterate_over: "linker_input_params" @@ -14604,9 +13926,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_group { flag: "-Wl,--start-lib" @@ -15166,9 +14485,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" action: "c++-link-interface-dynamic-library" action: "objc-executable" action: "objc++-executable" @@ -15320,9 +14636,6 @@ toolchain { } 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: "@%{linker_param_file}" } @@ -15858,48 +15171,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-alwayslink-static-library" - action_name: "c++-link-alwayslink-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-pic-static-library" - action_name: "c++-link-pic-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-alwayslink-pic-static-library" - action_name: "c++-link-alwayslink-pic-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { config_name: "c++-link-interface-dynamic-library" action_name: "c++-link-interface-dynamic-library" tool { @@ -16151,12 +15422,9 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-pic-static-library" implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" - implies: "c++-link-alwayslink-static-library" - implies: "c++-link-alwayslink-pic-static-library" implies: "c++-link-executable" } feature { @@ -16229,9 +15497,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: "-Wl,-all_load" } @@ -16242,9 +15507,6 @@ toolchain { name: "archiver_flags" 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: "rcs" flag: "%{output_execpath}" @@ -16259,9 +15521,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: "-Wl,-rpath,@loader_path/%{runtime_library_search_directories}" iterate_over: "runtime_library_search_directories" @@ -16273,9 +15532,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: "%{runtime_root_flags}" iterate_over: "runtime_root_flags" @@ -16287,9 +15543,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: "%{runtime_root_entries}" iterate_over: "runtime_root_entries" @@ -16304,9 +15557,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: "-L%{library_search_directories}" iterate_over: "library_search_directories" @@ -16318,9 +15568,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: "%{libopts}" iterate_over: "libopts" @@ -16332,9 +15579,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: "-Wl,-force_load,%{whole_archive_linker_params}" iterate_over: "whole_archive_linker_params" @@ -16346,9 +15590,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_input_params}" iterate_over: "linker_input_params" @@ -16360,9 +15601,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_group { flag: "-Wl,--start-lib" @@ -16922,9 +16160,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" action: "c++-link-interface-dynamic-library" action: "objc-executable" action: "objc++-executable" @@ -17076,9 +16311,6 @@ toolchain { } 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: "@%{linker_param_file}" } @@ -17614,48 +16846,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-alwayslink-static-library" - action_name: "c++-link-alwayslink-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-pic-static-library" - action_name: "c++-link-pic-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { - config_name: "c++-link-alwayslink-pic-static-library" - action_name: "c++-link-alwayslink-pic-static-library" - tool { - tool_path: "wrapped_ar" - execution_requirement: "requires-darwin" - } - implies: "global_whole_archive_open" - implies: "runtime_root_flags" - implies: "archiver_flags" - implies: "input_param_flags" - implies: "linker_param_file" - implies: "apple_env" - } - action_config { config_name: "c++-link-interface-dynamic-library" action_name: "c++-link-interface-dynamic-library" tool { |