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

RELNOTES: None. PiperOrigin-RevId: 191713379
mmikitka · Apr 5, 2018 · 832a0b1 · 832a0b1
1 parent 8abed4b
commit 832a0b1
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 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
@@ -116,7 +116,6 @@ public void collectMetadataArtifacts(Iterable<Artifact> objectFiles,
 
   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
@@ -369,7 +369,6 @@ public static String getCppActionConfigs(
                     "  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 static String getCppActionConfigs(
                     "    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 static String getCppActionConfigs(
                     "    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 static String getCppActionConfigs(
                     "    }",
                     "  }",
                     "  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 static String getCppActionConfigs(
                     "    }",
                     "  }",
                     "  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
@@ -160,7 +160,7 @@ public enum LinkTargetType {
     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),