2 files changed, 8 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Package.java b/src/main/java/com/google/devtools/build/lib/packages/Package.java
index 04a8ef44c3..537866e765 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Package.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Package.java
@@ -397,7 +397,10 @@ public class Package {
   public Map<String, String> getAllMakeVariables(String platform) {
     ImmutableMap.Builder<String, String> map = ImmutableMap.builder();
     for (String var : makeEnv.getBindings().keySet()) {
-      map.put(var, makeEnv.lookup(var, platform));
+      String value = makeEnv.lookup(var, platform);
+      if (value != null) {
+        map.put(var, value);
+      }
     }
     return map.build();
   }
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",