Ignore make variables undefined for requested platform.

--
MOS_MIGRATED_REVID=126333303

1 files changed, 4 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
index 85a3adbccf..f242aebb1a 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
@@ -338,23 +338,24 @@ public final class PackageFactory {
   @VisibleForTesting
   public abstract static class FactoryForTesting {
     public final PackageFactory create(RuleClassProvider ruleClassProvider, FileSystem fs) {
-      return create(ruleClassProvider, ImmutableList.<EnvironmentExtension>of(), fs);
+      return create(ruleClassProvider, null, ImmutableList.<EnvironmentExtension>of(), fs);
     }
     
     public final PackageFactory create(
         RuleClassProvider ruleClassProvider,
         EnvironmentExtension environmentExtension,
         FileSystem fs) {
-      return create(ruleClassProvider, ImmutableList.of(environmentExtension), fs);
+      return create(ruleClassProvider, null, ImmutableList.of(environmentExtension), fs);
     }
   
     public final PackageFactory create(
         RuleClassProvider ruleClassProvider,
+        Map<String, String> platformSetRegexps,
         Iterable<EnvironmentExtension> environmentExtensions,
         FileSystem fs) {
       return create(
           ruleClassProvider,
-          null,
+          platformSetRegexps,
           AttributeContainer.ATTRIBUTE_CONTAINER_FACTORY,
           environmentExtensions,
           "test",