--- a/make/CompileJavaModules.gmk Wed Mar 13 07:46:52 2019 -0400
+++ b/make/CompileJavaModules.gmk Wed Mar 13 07:52:16 2019 -0400
@@ -470,6 +470,7 @@
org.graalvm.compiler.debug.test \
org.graalvm.compiler.graph.test \
org.graalvm.compiler.hotspot.amd64.test \
+ org.graalvm.compiler.hotspot.jdk9.test \
org.graalvm.compiler.hotspot.lir.test \
org.graalvm.compiler.hotspot.sparc.test \
org.graalvm.compiler.hotspot.test \
@@ -547,8 +548,13 @@
################################################################################
# If this is an imported module that has prebuilt classes, only compile
# module-info.java.
-ifneq ($(wildcard $(IMPORT_MODULES_CLASSES)/$(MODULE)), )
- $(MODULE)_INCLUDE_FILES := module-info.java
+ifneq ($(IMPORT_MODULES_CLASSES), )
+ IMPORT_MODULE_DIR := $(IMPORT_MODULES_CLASSES)/$(MODULE)
+ ifneq ($(wildcard $(IMPORT_MODULE_DIR)), )
+ $(MODULE)_INCLUDE_FILES := module-info.java
+ endif
+else
+ IMPORT_MODULE_DIR :=
endif
################################################################################
@@ -654,13 +660,13 @@
# If this is an imported module, copy the pre built classes and resources into
# the modules output dir
-ifneq ($(wildcard $(IMPORT_MODULES_CLASSES)/$(MODULE)), )
+ifneq ($(wildcard $(IMPORT_MODULE_DIR)), )
$(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker: \
- $(call CacheFind, $(IMPORT_MODULES_CLASSES)/$(MODULE))
+ $(call CacheFind, $(IMPORT_MODULE_DIR))
$(call MakeDir, $(@D))
# Do not delete marker and build meta data files
$(RM) -r $(filter-out $(@D)/_%, $(wildcard $(@D)/*))
- $(CP) -R $(IMPORT_MODULES_CLASSES)/$(MODULE)/* $(@D)/
+ $(CP) -R $(IMPORT_MODULE_DIR)/* $(@D)/
$(TOUCH) $@
TARGETS += $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker