make/CompileJavaModules.gmk
changeset 42532 4780f4130eb0
parent 42531 37ee95196b17
child 42534 f489cf041782
equal deleted inserted replaced
42531:37ee95196b17 42532:4780f4130eb0
   490     org.graalvm.compiler.virtual.bench \
   490     org.graalvm.compiler.virtual.bench \
   491     #
   491     #
   492 
   492 
   493 ################################################################################
   493 ################################################################################
   494 
   494 
       
   495 jdk.aot_ADD_JAVAC_FLAGS := -parameters -XDstringConcat=inline
       
   496 
       
   497 ################################################################################
       
   498 
   495 jdk.xml.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
   499 jdk.xml.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
   496 jdk.xml.bind_CLEAN := .properties
   500 jdk.xml.bind_CLEAN := .properties
   497 jdk.xml.bind_COPY := .xsd JAXBContextFactory.java ZeroOneBooleanAdapter.java
   501 jdk.xml.bind_COPY := .xsd JAXBContextFactory.java ZeroOneBooleanAdapter.java
   498 
   502 
   499 ################################################################################
   503 ################################################################################
   555   ## WORKAROUND jdk.vm.compiler source structure issue
   559   ## WORKAROUND jdk.vm.compiler source structure issue
   556   VM_COMPILER_MODULESOURCEPATH := $(MODULESOURCEPATH) \
   560   VM_COMPILER_MODULESOURCEPATH := $(MODULESOURCEPATH) \
   557       $(subst /$(MODULE)/,/*/, $(filter-out %processor/src %test/src %jtt/src %bench/src %microbenchmarks/src, \
   561       $(subst /$(MODULE)/,/*/, $(filter-out %processor/src %test/src %jtt/src %bench/src %microbenchmarks/src, \
   558           $(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src)))
   562           $(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src)))
   559   MODULESOURCEPATH := $(call PathList, $(VM_COMPILER_MODULESOURCEPATH))
   563   MODULESOURCEPATH := $(call PathList, $(VM_COMPILER_MODULESOURCEPATH))
       
   564 endif
       
   565 
       
   566 ifeq ($(MODULE), jdk.aot)
       
   567   ## WORKAROUND jdk.aot source structure issue
       
   568   AOT_MODULESOURCEPATH := $(MODULESOURCEPATH) \
       
   569       $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
       
   570           $(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src)))
       
   571   MODULESOURCEPATH := $(call PathList, $(AOT_MODULESOURCEPATH))
   560 endif
   572 endif
   561 
   573 
   562 $(eval $(call SetupJavaCompilation, $(MODULE), \
   574 $(eval $(call SetupJavaCompilation, $(MODULE), \
   563     SETUP := $(if $($(MODULE)_SETUP), $($(MODULE)_SETUP), GENERATE_JDKBYTECODE), \
   575     SETUP := $(if $($(MODULE)_SETUP), $($(MODULE)_SETUP), GENERATE_JDKBYTECODE), \
   564     MODULE := $(MODULE), \
   576     MODULE := $(MODULE), \