Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8153261: Clean up fix for JDK-8153217
authorerikj
Fri, 01 Apr 2016 17:08:43 +0200
changeset 36725 f458544b0d76
parent 36724 32a7658a6e0e
child 36726 90083f9a087c
8153261: Clean up fix for JDK-8153217 Reviewed-by: tbell
make/Images.gmk file | annotate | diff | comparison | revisions
make/common/Modules.gmk file | annotate | diff | comparison | revisions 
--- a/make/Images.gmk	Fri Apr 01 17:06:44 2016 +0200
+++ b/make/Images.gmk	Fri Apr 01 17:08:43 2016 +0200
@@ -41,8 +41,7 @@
 # All modules for the current target platform.
 ALL_MODULES := $(call FindAllModules)
 
-IMPORTED_MODULES := $(call FindImportedModules)
-$(foreach m, $(IMPORTED_MODULES), $(eval $(call ReadSingleImportMetaData, $m)))
+$(eval $(call ReadImportMetaData))
 
 JRE_MODULES += $(filter-out $(MODULES_FILTER), $(BOOT_MODULES) $(PLATFORM_MODULES) $(JRE_TOOL_MODULES))
 JDK_MODULES += $(filter-out $(MODULES_FILTER), $(ALL_MODULES))
--- a/make/common/Modules.gmk	Fri Apr 01 17:06:44 2016 +0200
+++ b/make/common/Modules.gmk	Fri Apr 01 17:08:43 2016 +0200
@@ -252,8 +252,9 @@
 # * PLATFORM_MODULES
 # * JRE_TOOL_MODULES
 define ReadImportMetaData
-    IMPORTED_MODULES := $(call FindImportedModules)
-    $(foreach m, $(IMPORTED_MODULES), $(eval $(call ReadSingleImportMetaData, $m)))
+    IMPORTED_MODULES := $$(call FindImportedModules)
+    $$(foreach m, $$(IMPORTED_MODULES), \
+      $$(eval $$(call ReadSingleImportMetaData, $$m)))
 endef
 
 ################################################################################
jdk-sandbox