Mercurial > hg > jdk9-shenandoah

changeset 1324:6bfd6ad07c7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8073166: Unable to successfully build the merge of jdk9/hs with jdk9/dev Reviewed-by: alanb
author erikj
date Mon, 16 Feb 2015 12:25:56 +0100
parents a67cf596b4fd
children 209734e14cb9 c053f9a0aa72
files make/Main.gmk
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/Main.gmk	Fri Feb 13 11:03:13 2015 +0800
+++ b/make/Main.gmk	Mon Feb 16 12:25:56 2015 +0100
@@ -347,8 +347,8 @@
   $(foreach m, $(RMIC_MODULES), $(eval $m-rmic: $m-java))
 
   # Declare dependencies from <module>-lib to <module>-java
-  # Skip jdk.jdwp.agent as it contains no java code.
-  $(foreach m, $(filter-out jdk.jdwp.agent, $(LIBS_MODULES)), $(eval $m-libs: $m-java))
+  # Skip modules that do not have java source.
+  $(foreach m, $(filter $(JAVA_MODULES), $(LIBS_MODULES)), $(eval $m-libs: $m-java))
 
   # Declare dependencies from all other <module>-lib to java.base-lib
   $(foreach t, $(filter-out java.base-libs, $(LIBS_TARGETS)), \