changeset 2138:ce9c7cd866d6

Merge
author erikj
date Thu, 03 Dec 2015 11:34:57 +0100
parents 39a8e17957f6 f00cc7909d28
children e537376ebe50
files
diffstat 1 files changed, 3 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/make/CompileJavaModules.gmk	Thu Dec 03 11:10:57 2015 +0100
+++ b/make/CompileJavaModules.gmk	Thu Dec 03 11:34:57 2015 +0100
@@ -523,24 +523,11 @@
 # Add imported modules to the moduleclasspath
 MODULECLASSPATH := $(subst $(SPACE),$(PATH_SEP), $(IMPORT_MODULES_CLASSES))
 
-ifneq ($(findstring $(MODULE), jdk.vm.ci jdk.jfr), )
+ifeq ($(MODULE), jdk.vm.ci)
   ## WORKAROUND jdk.vm.ci source structure issue
-  HOTSPOT_JVMCI_SRC := $(subst $(MODULE),*,$(HOTSPOT_TOPDIR)/src/jdk.vm.ci/share/classes)
   JVMCI_MODULESOURCEPATH := $(MODULESOURCEPATH) \
-    $(HOTSPOT_JVMCI_SRC)/jdk.vm.ci.amd64/src \
-    $(HOTSPOT_JVMCI_SRC)/jdk.vm.ci.code/src \
-    $(HOTSPOT_JVMCI_SRC)/jdk.vm.ci.common/src \
-    $(HOTSPOT_JVMCI_SRC)/jdk.vm.ci.hotspot/src \
-    $(HOTSPOT_JVMCI_SRC)/jdk.vm.ci.hotspot.amd64/src \
-    $(HOTSPOT_JVMCI_SRC)/jdk.vm.ci.hotspot.sparc/src \
-    $(HOTSPOT_JVMCI_SRC)/jdk.vm.ci.hotspotvmconfig/src \
-    $(HOTSPOT_JVMCI_SRC)/jdk.vm.ci.inittimer/src \
-    $(HOTSPOT_JVMCI_SRC)/jdk.vm.ci.meta/src \
-    $(HOTSPOT_JVMCI_SRC)/jdk.vm.ci.options/src \
-    $(HOTSPOT_JVMCI_SRC)/jdk.vm.ci.runtime/src \
-    $(HOTSPOT_JVMCI_SRC)/jdk.vm.ci.service/src \
-    $(HOTSPOT_JVMCI_SRC)/jdk.vm.ci.sparc/src
-
+      $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
+          $(wildcard $(HOTSPOT_TOPDIR)/src/jdk.vm.ci/share/classes/*/src)))
   MODULESOURCEPATH := $(subst $(SPACE),$(PATH_SEP), $(JVMCI_MODULESOURCEPATH))
 endif