--- a/make/CreateJmods.gmk	Wed Apr 19 13:37:34 2017 +0200
+++ b/make/CreateJmods.gmk	Thu Apr 20 08:00:18 2017 -0700
@@ -135,8 +135,8 @@
 	$(RM) $@ $(JMODS_TEMPDIR)/$(notdir $@)
 	$(JMOD) create \
             --module-version $(VERSION_SHORT) \
-            --os-name '$(REQUIRED_OS_NAME)' \
-            --os-arch '$(REQUIRED_OS_ARCH)' \
+            --os-name '$(OPENJDK_MODULE_TARGET_OS_NAME)' \
+            --os-arch '$(OPENJDK_MODULE_TARGET_OS_ARCH)' \
             --module-path $(JMODS_DIR) \
 	    --exclude '**{_the.*,_*.marker,*.diz,*.debuginfo,*.dSYM/**,*.dSYM,*.pdb,*.map}' \
 	    $(JMOD_FLAGS) $(JMODS_TEMPDIR)/$(notdir $@)