changeset 47653:4c294a196030

8189376: Unsorted $(wildcard) causes instable module-deps.gmk Reviewed-by: erikj, tbell Contributed-by: Martin Buchholz <martinrb@google.com>
author ihse
date Thu, 26 Oct 2017 10:39:59 +0200
parents 7a7bc84f4b6c
children 9c1e4b0a4761
files make/common/Modules.gmk
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/Modules.gmk	Thu Oct 26 08:52:55 2017 +0200
+++ b/make/common/Modules.gmk	Thu Oct 26 10:39:59 2017 +0200
@@ -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