commit a69940ab56a774cc5802fc1aec51fd6df794e1c6
author Martin Buchholz <martinrb@google.com> Thu Oct 26 10:39:59 2017 +0200
committer Magnus Ihse Bursie <ihse@openjdk.org> Thu Oct 26 10:39:59 2017 +0200
tree 48895ed58b870e427d5d20065865f53ff83487f5
parent f4672a738ba3fe48bb18c70eed77694ccea0d172

8189376: Unsorted $(wildcard) causes instable module-deps.gmk

Reviewed-by: erikj, tbell

make/common/Modules.gmk

diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
index 047ad3c..04cafcd 100644
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@@ -249,10 +249,10 @@
 # configuration.
 # Param 1 - Module to find for, set to * for finding all
 FindAllModuleInfos = \
-    $(wildcard \
+    $(sort $(wildcard \
         $(foreach sub, $(SRC_SUBDIRS), \
           $(patsubst %,%/$(strip $1)/$(sub)/module-info.java, $(TOP_SRC_DIRS))) \
-        $(patsubst %,%/$(strip $1)/module-info.java, $(IMPORT_MODULES_SRC)))
+        $(patsubst %,%/$(strip $1)/module-info.java, $(IMPORT_MODULES_SRC))))
 
 # Find module-info.java files in the specific source dir
 # Param 1 - Src dir to find module-info.java files in