468 org.graalvm.compiler.core.match.processor \ |
468 org.graalvm.compiler.core.match.processor \ |
469 org.graalvm.compiler.core.test \ |
469 org.graalvm.compiler.core.test \ |
470 org.graalvm.compiler.debug.test \ |
470 org.graalvm.compiler.debug.test \ |
471 org.graalvm.compiler.graph.test \ |
471 org.graalvm.compiler.graph.test \ |
472 org.graalvm.compiler.hotspot.amd64.test \ |
472 org.graalvm.compiler.hotspot.amd64.test \ |
|
473 org.graalvm.compiler.hotspot.jdk9.test \ |
473 org.graalvm.compiler.hotspot.lir.test \ |
474 org.graalvm.compiler.hotspot.lir.test \ |
474 org.graalvm.compiler.hotspot.sparc.test \ |
475 org.graalvm.compiler.hotspot.sparc.test \ |
475 org.graalvm.compiler.hotspot.test \ |
476 org.graalvm.compiler.hotspot.test \ |
476 org.graalvm.compiler.jtt \ |
477 org.graalvm.compiler.jtt \ |
477 org.graalvm.compiler.lir.jtt \ |
478 org.graalvm.compiler.lir.jtt \ |
545 jdk.jfr_ADD_JAVAC_FLAGS := -XDstringConcat=inline -Xlint:-exports |
546 jdk.jfr_ADD_JAVAC_FLAGS := -XDstringConcat=inline -Xlint:-exports |
546 |
547 |
547 ################################################################################ |
548 ################################################################################ |
548 # If this is an imported module that has prebuilt classes, only compile |
549 # If this is an imported module that has prebuilt classes, only compile |
549 # module-info.java. |
550 # module-info.java. |
550 ifneq ($(wildcard $(IMPORT_MODULES_CLASSES)/$(MODULE)), ) |
551 ifneq ($(IMPORT_MODULES_CLASSES), ) |
551 $(MODULE)_INCLUDE_FILES := module-info.java |
552 IMPORT_MODULE_DIR := $(IMPORT_MODULES_CLASSES)/$(MODULE) |
|
553 ifneq ($(wildcard $(IMPORT_MODULE_DIR)), ) |
|
554 $(MODULE)_INCLUDE_FILES := module-info.java |
|
555 endif |
|
556 else |
|
557 IMPORT_MODULE_DIR := |
552 endif |
558 endif |
553 |
559 |
554 ################################################################################ |
560 ################################################################################ |
555 # Setup the compilation for the module |
561 # Setup the compilation for the module |
556 # |
562 # |
652 |
658 |
653 ################################################################################ |
659 ################################################################################ |
654 # If this is an imported module, copy the pre built classes and resources into |
660 # If this is an imported module, copy the pre built classes and resources into |
655 # the modules output dir |
661 # the modules output dir |
656 |
662 |
657 ifneq ($(wildcard $(IMPORT_MODULES_CLASSES)/$(MODULE)), ) |
663 ifneq ($(wildcard $(IMPORT_MODULE_DIR)), ) |
658 $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker: \ |
664 $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker: \ |
659 $(call CacheFind, $(IMPORT_MODULES_CLASSES)/$(MODULE)) |
665 $(call CacheFind, $(IMPORT_MODULE_DIR)) |
660 $(call MakeDir, $(@D)) |
666 $(call MakeDir, $(@D)) |
661 # Do not delete marker and build meta data files |
667 # Do not delete marker and build meta data files |
662 $(RM) -r $(filter-out $(@D)/_%, $(wildcard $(@D)/*)) |
668 $(RM) -r $(filter-out $(@D)/_%, $(wildcard $(@D)/*)) |
663 $(CP) -R $(IMPORT_MODULES_CLASSES)/$(MODULE)/* $(@D)/ |
669 $(CP) -R $(IMPORT_MODULE_DIR)/* $(@D)/ |
664 $(TOUCH) $@ |
670 $(TOUCH) $@ |
665 |
671 |
666 TARGETS += $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker |
672 TARGETS += $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker |
667 |
673 |
668 # Add this dependency to avoid a race between compiling module-info.java and |
674 # Add this dependency to avoid a race between compiling module-info.java and |