Remove c++-link-interface-dynamic-library from crosstools, it's not used

RELNOTES: None.
PiperOrigin-RevId: 191713379

9 files changed, 1 insertions, 390 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
index 29654dece5..8db2bd3ba3 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
@@ -116,7 +116,6 @@ public final class CcCommon {
 
   public static final ImmutableSet<String> ALL_LINK_ACTIONS =
       ImmutableSet.of(
-          Link.LinkTargetType.INTERFACE_DYNAMIC_LIBRARY.getActionName(),
           Link.LinkTargetType.DYNAMIC_LIBRARY.getActionName(),
           Link.LinkTargetType.NODEPS_DYNAMIC_LIBRARY.getActionName(),
           LinkTargetType.EXECUTABLE.getActionName());
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 b2c2c5804a..3b49a4d879 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
@@ -369,7 +369,6 @@ public class CppActionConfigs {
                     "  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'",
@@ -855,7 +854,6 @@ public class CppActionConfigs {
                     "    action: 'c++-link-executable'",
                     "    action: 'c++-link-dynamic-library'",
                     "    action: 'c++-link-nodeps-dynamic-library'",
-                    "    action: 'c++-link-interface-dynamic-library'",
                     "    flag_group {",
                     "      expand_if_all_available: 'is_using_fission'",
                     "      flag: '-Wl,--gdb-index'",
@@ -870,7 +868,6 @@ public class CppActionConfigs {
                     "    action: 'c++-link-executable'",
                     "    action: 'c++-link-dynamic-library'",
                     "    action: 'c++-link-nodeps-dynamic-library'",
-                    "    action: 'c++-link-interface-dynamic-library'",
                     "    flag_group {",
                     "      expand_if_all_available: 'strip_debug_symbols'",
                     "      flag: '-Wl,-S'",
@@ -898,7 +895,6 @@ public class CppActionConfigs {
                     "    }",
                     "  }",
                     "  flag_set {",
-                    "    action: 'c++-link-interface-dynamic-library'",
                     "    action: 'c++-link-dynamic-library'",
                     "    action: 'c++-link-nodeps-dynamic-library'",
                     "    action: 'c++-link-executable'",
@@ -931,7 +927,6 @@ public class CppActionConfigs {
                     "    }",
                     "  }",
                     "  flag_set {",
-                    "    action: 'c++-link-interface-dynamic-library'",
                     "    action: 'c++-link-dynamic-library'",
                     "    action: 'c++-link-nodeps-dynamic-library'",
                     "    action: 'c++-link-executable'",
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 6ec2c38831..daf26b6c09 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
@@ -160,7 +160,7 @@ public abstract class Link {
     INTERFACE_DYNAMIC_LIBRARY(
         ".ifso",
         Staticness.DYNAMIC,
-        "c++-link-interface-dynamic-library",
+        "c++-link-dynamic-library",
         Picness.NOPIC,  // Actually PIC but it's not indicated in the file name
         ArtifactCategory.INTERFACE_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 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'"
diff --git a/tools/cpp/CROSSTOOL.tpl b/tools/cpp/CROSSTOOL.tpl
index 8ed7608e84..d830aded1d 100644
--- a/tools/cpp/CROSSTOOL.tpl
+++ b/tools/cpp/CROSSTOOL.tpl
@@ -494,17 +494,6 @@ toolchain {
     implies: 'msvc_env'
   }
 
-  action_config {
-    config_name: 'c++-link-interface-dynamic-library'
-    action_name: 'c++-link-interface-dynamic-library'
-    tool {
-      tool_path: '%{msvc_lib_path}'
-    }
-    implies: 'nologo'
-    implies: 'linker_param_file'
-    implies: 'msvc_env'
-  }
-
   # TODO(b/65151735): Remove legacy_compile_flags feature when legacy fields are
   # not used in this crosstool
   feature {
diff --git a/tools/cpp/crosstool_utils.bzl b/tools/cpp/crosstool_utils.bzl
index caadba1f31..06bfc63202 100644
--- a/tools/cpp/crosstool_utils.bzl
+++ b/tools/cpp/crosstool_utils.bzl
@@ -31,7 +31,6 @@ COMPILE_ACTIONS = [
 
 # All possible C++ link actions
 LINK_ACTIONS = [
-    "c++-link-interface-dynamic-library",
     "c++-link-dynamic-library",
     "c++-link-nodeps-dynamic-library",
     "c++-link-executable",
diff --git a/tools/cpp/unix_cc_configure.bzl b/tools/cpp/unix_cc_configure.bzl
index d7c457e395..b609f99b61 100644
--- a/tools/cpp/unix_cc_configure.bzl
+++ b/tools/cpp/unix_cc_configure.bzl
@@ -375,7 +375,6 @@ def _coverage_feature(darwin):
 
       }
       flag_set {
-        action: 'c++-link-interface-dynamic-library'
         action: 'c++-link-dynamic-library'
         action: 'c++-link-executable'
         """ + link_flags + """
diff --git a/tools/osx/crosstool/CROSSTOOL.tpl b/tools/osx/crosstool/CROSSTOOL.tpl
index 3ab431a845..3d61412efb 100644
--- a/tools/osx/crosstool/CROSSTOOL.tpl
+++ b/tools/osx/crosstool/CROSSTOOL.tpl
@@ -228,7 +228,6 @@ toolchain {
   feature {
     name: "contains_objc_source"
     flag_set {
-      action: "c++-link-interface-dynamic-library"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
       action: "c++-link-executable"
@@ -250,7 +249,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"
@@ -261,7 +259,6 @@ toolchain {
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
-      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
       flag_group {
@@ -767,7 +764,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"
@@ -844,7 +840,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"
@@ -874,7 +869,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"
@@ -975,7 +969,6 @@ toolchain {
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
       action: "c++-link-static-library"
-      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
       action: "linkstamp-compile"
@@ -1662,17 +1655,6 @@ toolchain {
     implies: "apple_env"
   }
   action_config {
-    config_name: "c++-link-interface-dynamic-library"
-    action_name: "c++-link-interface-dynamic-library"
-    tool {
-      tool_path: "wrapped_clang"
-      execution_requirement: "requires-darwin"
-    }
-    implies: "contains_objc_source"
-    implies: "strip_debug_symbols"
-    implies: "apple_env"
-  }
-  action_config {
     config_name: "objc-fully-link"
     action_name: "objc-fully-link"
     tool {
@@ -1878,7 +1860,6 @@ toolchain {
   feature {
     name: "contains_objc_source"
     flag_set {
-      action: "c++-link-interface-dynamic-library"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
       action: "c++-link-executable"
@@ -1887,7 +1868,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"
@@ -1910,7 +1890,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"
@@ -1921,7 +1900,6 @@ toolchain {
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
-      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
       flag_group {
@@ -2427,7 +2405,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"
@@ -2504,7 +2481,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"
@@ -2534,7 +2510,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"
@@ -2635,7 +2610,6 @@ toolchain {
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
       action: "c++-link-static-library"
-      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
       action: "linkstamp-compile"
@@ -3329,17 +3303,6 @@ toolchain {
     implies: "apple_env"
   }
   action_config {
-    config_name: "c++-link-interface-dynamic-library"
-    action_name: "c++-link-interface-dynamic-library"
-    tool {
-      tool_path: "wrapped_clang"
-      execution_requirement: "requires-darwin"
-    }
-    implies: "contains_objc_source"
-    implies: "strip_debug_symbols"
-    implies: "apple_env"
-  }
-  action_config {
     config_name: "objc-fully-link"
     action_name: "objc-fully-link"
     tool {
@@ -3545,7 +3508,6 @@ toolchain {
   feature {
     name: "contains_objc_source"
     flag_set {
-      action: "c++-link-interface-dynamic-library"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
       action: "c++-link-executable"
@@ -3554,7 +3516,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"
@@ -3577,7 +3538,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"
@@ -3588,7 +3548,6 @@ toolchain {
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
-      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
       flag_group {
@@ -4094,7 +4053,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"
@@ -4171,7 +4129,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"
@@ -4201,7 +4158,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"
@@ -4304,7 +4260,6 @@ toolchain {
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
       action: "c++-link-static-library"
-      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
       action: "linkstamp-compile"
@@ -4998,17 +4953,6 @@ toolchain {
     implies: "apple_env"
   }
   action_config {
-    config_name: "c++-link-interface-dynamic-library"
-    action_name: "c++-link-interface-dynamic-library"
-    tool {
-      tool_path: "wrapped_clang"
-      execution_requirement: "requires-darwin"
-    }
-    implies: "contains_objc_source"
-    implies: "strip_debug_symbols"
-    implies: "apple_env"
-  }
-  action_config {
     config_name: "objc-fully-link"
     action_name: "objc-fully-link"
     tool {
@@ -5215,7 +5159,6 @@ toolchain {
   feature {
     name: "contains_objc_source"
     flag_set {
-      action: "c++-link-interface-dynamic-library"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
       action: "c++-link-executable"
@@ -5224,7 +5167,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"
@@ -5247,7 +5189,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"
@@ -5258,7 +5199,6 @@ toolchain {
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
-      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
       flag_group {
@@ -5764,7 +5704,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"
@@ -5841,7 +5780,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"
@@ -5871,7 +5809,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"
@@ -5972,7 +5909,6 @@ toolchain {
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
       action: "c++-link-static-library"
-      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
       action: "linkstamp-compile"
@@ -6697,17 +6633,6 @@ toolchain {
     implies: "apple_env"
   }
   action_config {
-    config_name: "c++-link-interface-dynamic-library"
-    action_name: "c++-link-interface-dynamic-library"
-    tool {
-      tool_path: "wrapped_clang"
-      execution_requirement: "requires-darwin"
-    }
-    implies: "contains_objc_source"
-    implies: "strip_debug_symbols"
-    implies: "apple_env"
-  }
-  action_config {
     config_name: "objc-fully-link"
     action_name: "objc-fully-link"
     tool {
@@ -6913,7 +6838,6 @@ toolchain {
   feature {
     name: "contains_objc_source"
     flag_set {
-      action: "c++-link-interface-dynamic-library"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
       action: "c++-link-executable"
@@ -6922,7 +6846,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"
@@ -6945,7 +6868,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"
@@ -6956,7 +6878,6 @@ toolchain {
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
-      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
       flag_group {
@@ -7462,7 +7383,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"
@@ -7539,7 +7459,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"
@@ -7569,7 +7488,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"
@@ -7670,7 +7588,6 @@ toolchain {
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
       action: "c++-link-static-library"
-      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
       action: "linkstamp-compile"
@@ -8364,17 +8281,6 @@ toolchain {
     implies: "apple_env"
   }
   action_config {
-    config_name: "c++-link-interface-dynamic-library"
-    action_name: "c++-link-interface-dynamic-library"
-    tool {
-      tool_path: "wrapped_clang"
-      execution_requirement: "requires-darwin"
-    }
-    implies: "contains_objc_source"
-    implies: "strip_debug_symbols"
-    implies: "apple_env"
-  }
-  action_config {
     config_name: "objc-fully-link"
     action_name: "objc-fully-link"
     tool {
@@ -8580,7 +8486,6 @@ toolchain {
   feature {
     name: "contains_objc_source"
     flag_set {
-      action: "c++-link-interface-dynamic-library"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
       action: "c++-link-executable"
@@ -8589,7 +8494,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"
@@ -8612,7 +8516,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"
@@ -8623,7 +8526,6 @@ toolchain {
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
-      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
       flag_group {
@@ -9129,7 +9031,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"
@@ -9206,7 +9107,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"
@@ -9236,7 +9136,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"
@@ -9337,7 +9236,6 @@ toolchain {
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
       action: "c++-link-static-library"
-      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
       action: "linkstamp-compile"
@@ -10019,17 +9917,6 @@ toolchain {
     implies: "apple_env"
   }
   action_config {
-    config_name: "c++-link-interface-dynamic-library"
-    action_name: "c++-link-interface-dynamic-library"
-    tool {
-      tool_path: "wrapped_clang"
-      execution_requirement: "requires-darwin"
-    }
-    implies: "contains_objc_source"
-    implies: "strip_debug_symbols"
-    implies: "apple_env"
-  }
-  action_config {
     config_name: "objc-fully-link"
     action_name: "objc-fully-link"
     tool {
@@ -10235,7 +10122,6 @@ toolchain {
   feature {
     name: "contains_objc_source"
     flag_set {
-      action: "c++-link-interface-dynamic-library"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
       action: "c++-link-executable"
@@ -10244,7 +10130,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"
@@ -10267,7 +10152,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"
@@ -10278,7 +10162,6 @@ toolchain {
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
-      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
       flag_group {
@@ -10784,7 +10667,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"
@@ -10861,7 +10743,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"
@@ -10891,7 +10772,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"
@@ -10994,7 +10874,6 @@ toolchain {
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
       action: "c++-link-static-library"
-      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
       action: "linkstamp-compile"
@@ -11676,17 +11555,6 @@ toolchain {
     implies: "apple_env"
   }
   action_config {
-    config_name: "c++-link-interface-dynamic-library"
-    action_name: "c++-link-interface-dynamic-library"
-    tool {
-      tool_path: "wrapped_clang"
-      execution_requirement: "requires-darwin"
-    }
-    implies: "contains_objc_source"
-    implies: "strip_debug_symbols"
-    implies: "apple_env"
-  }
-  action_config {
     config_name: "objc-fully-link"
     action_name: "objc-fully-link"
     tool {
@@ -11893,7 +11761,6 @@ toolchain {
   feature {
     name: "contains_objc_source"
     flag_set {
-      action: "c++-link-interface-dynamic-library"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
       action: "c++-link-executable"
@@ -11902,7 +11769,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"
@@ -11925,7 +11791,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"
@@ -11936,7 +11801,6 @@ toolchain {
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
-      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
       flag_group {
@@ -12442,7 +12306,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"
@@ -12519,7 +12382,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"
@@ -12549,7 +12411,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"
@@ -12650,7 +12511,6 @@ toolchain {
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
       action: "c++-link-static-library"
-      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
       action: "linkstamp-compile"
@@ -13363,17 +13223,6 @@ toolchain {
     implies: "apple_env"
   }
   action_config {
-    config_name: "c++-link-interface-dynamic-library"
-    action_name: "c++-link-interface-dynamic-library"
-    tool {
-      tool_path: "wrapped_clang"
-      execution_requirement: "requires-darwin"
-    }
-    implies: "contains_objc_source"
-    implies: "strip_debug_symbols"
-    implies: "apple_env"
-  }
-  action_config {
     config_name: "objc-fully-link"
     action_name: "objc-fully-link"
     tool {
@@ -13579,7 +13428,6 @@ toolchain {
   feature {
     name: "contains_objc_source"
     flag_set {
-      action: "c++-link-interface-dynamic-library"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
       action: "c++-link-executable"
@@ -13588,7 +13436,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"
@@ -13611,7 +13458,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"
@@ -13622,7 +13468,6 @@ toolchain {
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
-      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
       flag_group {
@@ -14128,7 +13973,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"
@@ -14205,7 +14049,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"
@@ -14235,7 +14078,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"
@@ -14336,7 +14178,6 @@ toolchain {
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
       action: "c++-link-static-library"
-      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
       action: "linkstamp-compile"
@@ -15018,17 +14859,6 @@ toolchain {
     implies: "apple_env"
   }
   action_config {
-    config_name: "c++-link-interface-dynamic-library"
-    action_name: "c++-link-interface-dynamic-library"
-    tool {
-      tool_path: "wrapped_clang"
-      execution_requirement: "requires-darwin"
-    }
-    implies: "contains_objc_source"
-    implies: "strip_debug_symbols"
-    implies: "apple_env"
-  }
-  action_config {
     config_name: "objc-fully-link"
     action_name: "objc-fully-link"
     tool {
@@ -15237,7 +15067,6 @@ toolchain {
   feature {
     name: "contains_objc_source"
     flag_set {
-      action: "c++-link-interface-dynamic-library"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
       action: "c++-link-executable"
@@ -15246,7 +15075,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"
@@ -15269,7 +15097,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"
@@ -15280,7 +15107,6 @@ toolchain {
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
-      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
       flag_group {
@@ -15786,7 +15612,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"
@@ -15863,7 +15688,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"
@@ -15893,7 +15717,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"
@@ -15994,7 +15817,6 @@ toolchain {
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
       action: "c++-link-static-library"
-      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
       action: "linkstamp-compile"
@@ -16676,17 +16498,6 @@ toolchain {
     implies: "apple_env"
   }
   action_config {
-    config_name: "c++-link-interface-dynamic-library"
-    action_name: "c++-link-interface-dynamic-library"
-    tool {
-      tool_path: "wrapped_clang"
-      execution_requirement: "requires-darwin"
-    }
-    implies: "contains_objc_source"
-    implies: "strip_debug_symbols"
-    implies: "apple_env"
-  }
-  action_config {
     config_name: "objc-fully-link"
     action_name: "objc-fully-link"
     tool {