diff --git a/jdk/make/gensrc/GensrcModuleLoaderMap.gmk b/jdk/make/gensrc/GensrcModuleLoaderMap.gmk
index 859017d2a6d..4d9fdbb9e22 100644
--- a/jdk/make/gensrc/GensrcModuleLoaderMap.gmk
+++ b/jdk/make/gensrc/GensrcModuleLoaderMap.gmk
@@ -25,7 +25,8 @@
 
 include Modules.gmk
 
-$(eval $(call ReadImportMetaData))
+IMPORTED_MODULES := $(call FindImportedModules)
+$(foreach m, $(IMPORTED_MODULES), $(eval $(call ReadSingleImportMetaData, $m)))
 
 # Replacing double-comma with a single comma is to workaround the issue
 # with some version of make on windows that doesn't substitute spaces