Allow rules to consume CcLinkParamsProviders provided by Skylark rules.

-- MOS_MIGRATED_REVID=135457049
r351574nc3 · Oct 7, 2016 · cae7a0f · cae7a0f
1 parent fd2bdc3
commit cae7a0f
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkParamsProvider.java
@@ -33,9 +33,18 @@ public final class CcLinkParamsProvider extends SkylarkClassObject
       new Function<TransitiveInfoCollection, CcLinkParamsStore>() {
         @Override
         public CcLinkParamsStore apply(TransitiveInfoCollection input) {
-          CcLinkParamsProvider provider = input.getProvider(
-              CcLinkParamsProvider.class);
-          return provider == null ? null : provider.getCcLinkParamsStore();
+          // Try native first...
+          CcLinkParamsProvider provider = input.getProvider(CcLinkParamsProvider.class);
+          if (provider != null) {
+            return provider.getCcLinkParamsStore();
+          }
+
+          // ... then try Skylark.
+          provider = (CcLinkParamsProvider) input.get(CC_LINK_PARAMS.getKey());
+          if (provider != null) {
+            return provider.getCcLinkParamsStore();
+          }
+          return null;
         }
       };