1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingHelper.java
index 3b85d35add..6a9bab624d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingHelper.java
@@ -107,9 +107,9 @@ public final class CcLinkingHelper {
       return providers;
     }
 
-    @SkylarkCallable(name = "cc_link_params_info", documented = false)
-    public CcLinkParamsInfo getCcLinkParamsInfo() {
-      return (CcLinkParamsInfo) providers.getProvider(CcLinkParamsInfo.PROVIDER.getKey());
+    @SkylarkCallable(name = "cc_linking_info", documented = false)
+    public CcLinkingInfo getCcLinkParamsInfo() {
+      return (CcLinkingInfo) providers.getProvider(CcLinkingInfo.PROVIDER.getKey());
     }
 
     public Map<String, NestedSet<Artifact>> getOutputGroups() {
@@ -551,9 +551,11 @@ public final class CcLinkingHelper {
           new CcSpecificLinkParamsProvider(
               createCcLinkParamsStore(ccLinkingOutputs, ccCompilationContextInfo, forcePic)));
     } else {
-      providers.put(
+      CcLinkingInfo.Builder ccLinkingInfoBuilder = CcLinkingInfo.Builder.create();
+      ccLinkingInfoBuilder.setCcLinkParamsInfo(
           new CcLinkParamsInfo(
               createCcLinkParamsStore(ccLinkingOutputs, ccCompilationContextInfo, forcePic)));
+      providers.put(ccLinkingInfoBuilder.build());
     }
     return new LinkingInfo(
         providers.build(), outputGroups, ccLinkingOutputs, originalLinkingOutputs);