diff options
author | 2018-04-05 02:16:10 -0700 | |
---|---|---|
committer | 2018-04-05 02:17:52 -0700 | |
commit | 832a0b193a9a098897781bc6298d0455b3913482 (patch) | |
tree | 212e1b8a37b246405eb8aad4531e68460e2ccd9b /src/test/java/com/google/devtools | |
parent | 8abed4bea512a4682ca715c900ed7fb4e27abf64 (diff) |
Remove c++-link-interface-dynamic-library from crosstools, it's not used
RELNOTES: None.
PiperOrigin-RevId: 191713379
Diffstat (limited to 'src/test/java/com/google/devtools')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL | 180 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java | 1 |
2 files changed, 0 insertions, 181 deletions
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 bca579cc2b..40e2b6a16d 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,7 +276,6 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" implies: "c++-link-executable" @@ -287,7 +286,6 @@ toolchain { action: "c++-link-executable" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" - action: "c++-link-interface-dynamic-library" flag_group { flag: "-Wl,-S" expand_if_all_available: "strip_debug_symbols" @@ -930,7 +928,6 @@ toolchain { flag_set { action: "c-compile" action: "c++-compile" - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -1037,7 +1034,6 @@ toolchain { } } flag_set { - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -1070,7 +1066,6 @@ toolchain { } } flag_set { - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -1770,16 +1765,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-interface-dynamic-library" - action_name: "c++-link-interface-dynamic-library" - tool { - tool_path: "mac/clang" - execution_requirement: "requires-darwin" - } - implies: "strip_debug_symbols" - implies: "apple_env" - } - action_config { config_name: "objc-fully-link" action_name: "objc-fully-link" tool { @@ -2033,7 +2018,6 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" implies: "c++-link-executable" @@ -2044,7 +2028,6 @@ toolchain { action: "c++-link-executable" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" - action: "c++-link-interface-dynamic-library" flag_group { flag: "-Wl,-S" expand_if_all_available: "strip_debug_symbols" @@ -2687,7 +2670,6 @@ toolchain { flag_set { action: "c-compile" action: "c++-compile" - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -2794,7 +2776,6 @@ toolchain { } } flag_set { - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -2827,7 +2808,6 @@ toolchain { } } flag_set { - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -3527,16 +3507,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-interface-dynamic-library" - action_name: "c++-link-interface-dynamic-library" - tool { - tool_path: "mac/clang" - execution_requirement: "requires-darwin" - } - implies: "strip_debug_symbols" - implies: "apple_env" - } - action_config { config_name: "objc-fully-link" action_name: "objc-fully-link" tool { @@ -3785,7 +3755,6 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" implies: "c++-link-executable" @@ -3796,7 +3765,6 @@ toolchain { action: "c++-link-executable" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" - action: "c++-link-interface-dynamic-library" flag_group { flag: "-Wl,-S" expand_if_all_available: "strip_debug_symbols" @@ -4439,7 +4407,6 @@ toolchain { flag_set { action: "c-compile" action: "c++-compile" - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -4546,7 +4513,6 @@ toolchain { } } flag_set { - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -4579,7 +4545,6 @@ toolchain { } } flag_set { - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -5279,16 +5244,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-interface-dynamic-library" - action_name: "c++-link-interface-dynamic-library" - tool { - tool_path: "mac/clang" - execution_requirement: "requires-darwin" - } - implies: "strip_debug_symbols" - implies: "apple_env" - } - action_config { config_name: "objc-fully-link" action_name: "objc-fully-link" tool { @@ -5537,7 +5492,6 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" implies: "c++-link-executable" @@ -5548,7 +5502,6 @@ toolchain { action: "c++-link-executable" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" - action: "c++-link-interface-dynamic-library" flag_group { flag: "-Wl,-S" expand_if_all_available: "strip_debug_symbols" @@ -6191,7 +6144,6 @@ toolchain { flag_set { action: "c-compile" action: "c++-compile" - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -6298,7 +6250,6 @@ toolchain { } } flag_set { - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -6331,7 +6282,6 @@ toolchain { } } flag_set { - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -7031,16 +6981,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-interface-dynamic-library" - action_name: "c++-link-interface-dynamic-library" - tool { - tool_path: "mac/clang" - execution_requirement: "requires-darwin" - } - implies: "strip_debug_symbols" - implies: "apple_env" - } - action_config { config_name: "objc-fully-link" action_name: "objc-fully-link" tool { @@ -7293,7 +7233,6 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" implies: "c++-link-executable" @@ -7304,7 +7243,6 @@ toolchain { action: "c++-link-executable" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" - action: "c++-link-interface-dynamic-library" flag_group { flag: "-Wl,-S" expand_if_all_available: "strip_debug_symbols" @@ -7947,7 +7885,6 @@ toolchain { flag_set { action: "c-compile" action: "c++-compile" - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -8054,7 +7991,6 @@ toolchain { } } flag_set { - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -8087,7 +8023,6 @@ toolchain { } } flag_set { - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -8793,16 +8728,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-interface-dynamic-library" - action_name: "c++-link-interface-dynamic-library" - tool { - tool_path: "iossim/clang" - execution_requirement: "requires-darwin" - } - implies: "strip_debug_symbols" - implies: "apple_env" - } - action_config { config_name: "objc-fully-link" action_name: "objc-fully-link" tool { @@ -9055,7 +8980,6 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" implies: "c++-link-executable" @@ -9066,7 +8990,6 @@ toolchain { action: "c++-link-executable" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" - action: "c++-link-interface-dynamic-library" flag_group { flag: "-Wl,-S" expand_if_all_available: "strip_debug_symbols" @@ -9711,7 +9634,6 @@ toolchain { flag_set { action: "c-compile" action: "c++-compile" - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -9818,7 +9740,6 @@ toolchain { } } flag_set { - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -9851,7 +9772,6 @@ toolchain { } } flag_set { - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -10557,16 +10477,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-interface-dynamic-library" - action_name: "c++-link-interface-dynamic-library" - tool { - tool_path: "watchsim/clang" - execution_requirement: "requires-darwin" - } - implies: "strip_debug_symbols" - implies: "apple_env" - } - action_config { config_name: "objc-fully-link" action_name: "objc-fully-link" tool { @@ -10820,7 +10730,6 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" implies: "c++-link-executable" @@ -10831,7 +10740,6 @@ toolchain { action: "c++-link-executable" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" - action: "c++-link-interface-dynamic-library" flag_group { flag: "-Wl,-S" expand_if_all_available: "strip_debug_symbols" @@ -11474,7 +11382,6 @@ toolchain { flag_set { action: "c-compile" action: "c++-compile" - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -11581,7 +11488,6 @@ toolchain { } } flag_set { - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -11614,7 +11520,6 @@ toolchain { } } flag_set { - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -12351,16 +12256,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-interface-dynamic-library" - action_name: "c++-link-interface-dynamic-library" - tool { - tool_path: "tvsim/clang" - execution_requirement: "requires-darwin" - } - implies: "strip_debug_symbols" - implies: "apple_env" - } - action_config { config_name: "objc-fully-link" action_name: "objc-fully-link" tool { @@ -12613,7 +12508,6 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" implies: "c++-link-executable" @@ -12624,7 +12518,6 @@ toolchain { action: "c++-link-executable" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" - action: "c++-link-interface-dynamic-library" flag_group { flag: "-Wl,-S" expand_if_all_available: "strip_debug_symbols" @@ -13267,7 +13160,6 @@ toolchain { flag_set { action: "c-compile" action: "c++-compile" - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -13374,7 +13266,6 @@ toolchain { } } flag_set { - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -13407,7 +13298,6 @@ toolchain { } } flag_set { - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -14113,16 +14003,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-interface-dynamic-library" - action_name: "c++-link-interface-dynamic-library" - tool { - tool_path: "iossim/clang" - execution_requirement: "requires-darwin" - } - implies: "strip_debug_symbols" - implies: "apple_env" - } - action_config { config_name: "objc-fully-link" action_name: "objc-fully-link" tool { @@ -14375,7 +14255,6 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" implies: "c++-link-executable" @@ -14386,7 +14265,6 @@ toolchain { action: "c++-link-executable" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" - action: "c++-link-interface-dynamic-library" flag_group { flag: "-Wl,-S" expand_if_all_available: "strip_debug_symbols" @@ -15029,7 +14907,6 @@ toolchain { flag_set { action: "c-compile" action: "c++-compile" - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -15136,7 +15013,6 @@ toolchain { } } flag_set { - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -15169,7 +15045,6 @@ toolchain { } } flag_set { - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -15895,16 +15770,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-interface-dynamic-library" - action_name: "c++-link-interface-dynamic-library" - tool { - tool_path: "ios/clang" - execution_requirement: "requires-darwin" - } - implies: "strip_debug_symbols" - implies: "apple_env" - } - action_config { config_name: "objc-fully-link" action_name: "objc-fully-link" tool { @@ -16157,7 +16022,6 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" implies: "c++-link-executable" @@ -16168,7 +16032,6 @@ toolchain { action: "c++-link-executable" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" - action: "c++-link-interface-dynamic-library" flag_group { flag: "-Wl,-S" expand_if_all_available: "strip_debug_symbols" @@ -16813,7 +16676,6 @@ toolchain { flag_set { action: "c-compile" action: "c++-compile" - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -16920,7 +16782,6 @@ toolchain { } } flag_set { - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -16953,7 +16814,6 @@ toolchain { } } flag_set { - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -17679,16 +17539,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-interface-dynamic-library" - action_name: "c++-link-interface-dynamic-library" - tool { - tool_path: "watchos/clang" - execution_requirement: "requires-darwin" - } - implies: "strip_debug_symbols" - implies: "apple_env" - } - action_config { config_name: "objc-fully-link" action_name: "objc-fully-link" tool { @@ -17942,7 +17792,6 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" implies: "c++-link-executable" @@ -17953,7 +17802,6 @@ toolchain { action: "c++-link-executable" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" - action: "c++-link-interface-dynamic-library" flag_group { flag: "-Wl,-S" expand_if_all_available: "strip_debug_symbols" @@ -18596,7 +18444,6 @@ toolchain { flag_set { action: "c-compile" action: "c++-compile" - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -18703,7 +18550,6 @@ toolchain { } } flag_set { - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -18736,7 +18582,6 @@ toolchain { } } flag_set { - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -19493,16 +19338,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-interface-dynamic-library" - action_name: "c++-link-interface-dynamic-library" - tool { - tool_path: "tvos/clang" - execution_requirement: "requires-darwin" - } - implies: "strip_debug_symbols" - implies: "apple_env" - } - action_config { config_name: "objc-fully-link" action_name: "objc-fully-link" tool { @@ -19755,7 +19590,6 @@ toolchain { implies: "c-compile" implies: "c++-compile" implies: "c++-link-static-library" - implies: "c++-link-interface-dynamic-library" implies: "c++-link-dynamic-library" implies: "c++-link-nodeps-dynamic-library" implies: "c++-link-executable" @@ -19766,7 +19600,6 @@ toolchain { action: "c++-link-executable" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" - action: "c++-link-interface-dynamic-library" flag_group { flag: "-Wl,-S" expand_if_all_available: "strip_debug_symbols" @@ -20409,7 +20242,6 @@ toolchain { flag_set { action: "c-compile" action: "c++-compile" - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -20516,7 +20348,6 @@ toolchain { } } flag_set { - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -20549,7 +20380,6 @@ toolchain { } } flag_set { - action: "c++-link-interface-dynamic-library" action: "c++-link-dynamic-library" action: "c++-link-nodeps-dynamic-library" action: "c++-link-executable" @@ -21275,16 +21105,6 @@ toolchain { implies: "apple_env" } action_config { - config_name: "c++-link-interface-dynamic-library" - action_name: "c++-link-interface-dynamic-library" - tool { - tool_path: "ios/clang" - execution_requirement: "requires-darwin" - } - implies: "strip_debug_symbols" - implies: "apple_env" - } - action_config { config_name: "objc-fully-link" action_name: "objc-fully-link" 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 81c86f9d9a..324ff10a86 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 @@ -401,7 +401,6 @@ public abstract class MockCcSupport { + " flag_set {" + " action: 'c-compile'" + " action: 'c++-compile'" - + " action: 'c++-link-interface-dynamic-library'" + " action: 'c++-link-dynamic-library'" + " action: 'c++-link-nodeps-dynamic-library'" + " action: 'c++-link-executable'" |