From 116ee6bdc630698708b44e8570b29bb3b770df24 Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Fri, 1 Apr 2016 17:08:43 +0200
Subject: [PATCH] 8153261: Clean up fix for JDK-8153217

Reviewed-by: tbell
---
 make/Images.gmk         | 3 +--
 make/common/Modules.gmk | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/make/Images.gmk b/make/Images.gmk
index f7650d2efd9..97cce400395 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -41,8 +41,7 @@ $(eval $(call IncludeCustomExtension, , Images-pre.gmk))
 # 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))
diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
index a2a7f238d78..6e7d360c718 100644
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@@ -252,8 +252,9 @@ endef
 # * 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
 
 ################################################################################