Don't rely on supports_interface_shared_objects for toolchain inputs

Progress towards: #6861 #5883 RELNOTES: None. PiperOrigin-RevId: 228175730
bazelbuild · Jan 7, 2019 · a4529db · a4529db
1 parent 684cc2e
commit a4529db
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 4 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderHelper.java
@@ -657,9 +657,7 @@ static CcToolchainProvider getCcToolchainProvider(
             attributes.getAdditionalBuildVariables()),
         getBuiltinIncludes(attributes.getLibc()),
         coverageEnvironment.build(),
-        toolchainInfo.supportsInterfaceSharedLibraries()
-            ? attributes.getLinkDynamicLibraryTool()
-            : null,
+        attributes.getLinkDynamicLibraryTool(),
         builtInIncludeDirectories,
         sysroot,
         fdoMode,

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
@@ -65,6 +65,9 @@ public boolean apply(Artifact artifact) {
   public static final String SUPPORTS_DYNAMIC_LINKER_FEATURE =
       "feature { name: '" + CppRuleClasses.SUPPORTS_DYNAMIC_LINKER + " enabled: true'}";
 
+  public static final String SUPPORTS_INTERFACE_SHARED_LIBRARIES =
+      "feature { name: '" + CppRuleClasses.SUPPORTS_INTERFACE_SHARED_LIBRARIES + "' enabled: true}";
+
   /** Feature expected by the C++ rules when pic build is requested */
   public static final String PIC_FEATURE =
       ""

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
@@ -40,6 +40,7 @@
 import com.google.devtools.build.lib.analysis.RunfilesProvider;
 import com.google.devtools.build.lib.analysis.util.ActionTester;
 import com.google.devtools.build.lib.analysis.util.ActionTester.ActionCombinationFactory;
+import com.google.devtools.build.lib.analysis.util.AnalysisMock;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.cmdline.RepositoryName;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
@@ -651,6 +652,28 @@ public void testInterfaceOutputWithoutBuildingDynamicLibraryIsError() throws Exc
 
   @Test
   public void testInterfaceOutputForDynamicLibrary() throws Exception {
+    AnalysisMock.get()
+        .ccSupport()
+        .setupCrosstool(
+            mockToolsConfig,
+            MockCcSupport.SUPPORTS_INTERFACE_SHARED_LIBRARIES,
+            "supports_interface_shared_objects: false");
+    useConfiguration();
+
+    scratch.file("foo/BUILD", "cc_library(name = 'foo', srcs = ['foo.cc'])");
+    ConfiguredTarget configuredTarget = getConfiguredTarget("//foo:foo");
+    assertThat(configuredTarget).isNotNull();
+    ImmutableList<String> inputs =
+        ImmutableList.copyOf(getGeneratingAction(configuredTarget, "foo/libfoo.so").getInputs())
+            .stream()
+            .map(Artifact::getExecPathString)
+            .collect(ImmutableList.toImmutableList());
+    assertThat(inputs.stream().anyMatch(i -> i.contains("tools/cpp/link_dynamic_library")))
+        .isTrue();
+  }
+
+  @Test
+  public void testInterfaceOutputForDynamicLibraryLegacy() throws Exception {
     RuleContext ruleContext = createDummyRuleContext();
 
     FeatureConfiguration featureConfiguration =

diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java
@@ -126,14 +126,30 @@ public void testLinkerParamFileIsExported() throws Exception {
   }
 
   @Test
-  public void testInterfaceLibraryBuildingVariablesWhenGenerationPossible() throws Exception {
+  public void testInterfaceLibraryBuildingVariablesWhenLegacyGenerationPossible() throws Exception {
     // Make sure the interface shared object generation is enabled in the configuration
     // (which it is not by default for some windows toolchains)
     AnalysisMock.get()
         .ccSupport()
         .setupCrosstool(mockToolsConfig, "supports_interface_shared_objects: true");
     useConfiguration();
 
+    verifyIfsoVariables();
+  }
+
+  @Test
+  public void testInterfaceLibraryBuildingVariablesWhenGenerationPossible() throws Exception {
+    // Make sure the interface shared object generation is enabled in the configuration
+    // (which it is not by default for some windows toolchains)
+    AnalysisMock.get()
+        .ccSupport()
+        .setupCrosstool(mockToolsConfig, MockCcSupport.SUPPORTS_INTERFACE_SHARED_LIBRARIES);
+    useConfiguration();
+
+    verifyIfsoVariables();
+  }
+
+  private void verifyIfsoVariables() throws Exception {
     scratch.file("x/BUILD", "cc_library(name = 'foo', srcs = ['a.cc'])");
     scratch.file("x/a.cc");